fix: merge conflicts

.gitlab-ci.yml

client.sample.happy-dev.css

src/dependencies.pug

src/header.pug

src/images/alien.svg

src/images/contributions-help.png

src/index.pug

src/menu-left.pug

src/page-about.pug

src/page-admin.pug

src/page-circle.pug

src/page-dashboard.pug

src/page-messages.pug

src/page-project.pug

src/styles/abstracts/_mixins.scss

src/styles/abstracts/_variables.scss

src/styles/base/_compat.scss

src/styles/base/about.scss

src/styles/base/form.scss

src/styles/base/header.scss