fix conflicts

.gitlab-ci.yml

@@ -20,10 +20,9 @@ pages:
   #only:
   #- master
 mysql_build:
-  stage: test
   variables:
-    MYSQL_DATABASE: headwork
-    MYSQL_ROOT_PASSWORD: root
+    MYSQL_DATABASE: hello_world_test
+    MYSQL_ROOT_PASSWORD: mysql
   services:
   - mysql
   image: mysql