fix conflicts

.babelrc

.eslintignore

.eslintrc.json

.gitignore

.gitlab-ci.yml

README.md

config.json

config.json.example

gulpfile.babel.js

libs/app.js

libs/config.js

libs/routes/api.js

libs/routes/cities.js

libs/routes/regions.js

libs/routes/states.js

package.json

server.js

src/libs/app.js

src/libs/config.js

src/libs/db/monet.js