fix(electron): fixing merging issue
fix(electron): fixing merging issue

rabix/cottontail-frontend,rabix/cottontail-frontend,rabix/composer,rabix/cottontail-frontend,marijanlekic/cottontail-frontend,marijanlekic/cottontail-frontend,marijanlekic/cottontail-frontend,rabix/cottontail-frontend,rabix/composer,rabix/composer