diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb4866f..5c69896 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,36 +1,3 @@
-<<<<<<< HEAD
-stages:
-  - build
-  - dockerize
-
-variables:
-  CONTAINER_IMAGE: registry.gitlab.com/ahmza/blog:latest
-
-Build:
-  stage: build
-  image: alpine:latest
-  before_script:
-    - which curl || ( apk update && apk add curl )
-    - curl -L https://github.com/gohugoio/hugo/releases/download/v0.90.0/hugo_0.90.0_Linux-64bit.tar.gz > hugo.tar.gz
-    - tar -zxf hugo.tar.gz
-    - mv hugo /usr/local/bin
-  script:
-    - hugo -D
-  artifacts:
-    paths:
-      - public
-
-Dockerize:
-  stage: dockerize
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
-=======
 #stages:
 #  - build
 #  - dockerize