update: merge conflict resolved + fixes

.gitlab-ci.yml

cypress/integration/create-channel.spec.js

cypress/integration/create-project.spec.js

package-lock.json

package.json

src/dependencies.pug

src/locales/en.json

src/locales/es.json

src/locales/fr.json

src/styles/about/_index.scss

src/styles/content/_index.scss

src/styles/index.scss

src/styles/job-offers/_index.scss

src/views/page-about.pug

src/views/page-circle.pug

src/views/partials/admin/page-admin-circles-create.pug

src/views/partials/admin/page-admin-circles.pug

src/views/partials/admin/page-admin-communities.pug

src/views/partials/admin/page-admin-projects-create.pug

src/views/partials/admin/page-admin-projects.pug