diff --git a/build.sh b/build.sh
index 02e8bad..beadffe 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,2 @@
 #!/bin/bash
-<<<<<<< HEAD
 docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
-=======
-docker build -t gitea.angoosh.com/meiri/alkator/api:latest .
->>>>>>> 00274fd0333fe8c95787df3a11cbeda3b72432a4