diff --git a/Makefile b/Makefile
index 48e516f..6e94635 100644
--- a/Makefile
+++ b/Makefile
@@ -119,33 +119,15 @@ $(OUT_DIR)/terraform: $(FETCH_DIR)/terraform
 			-o /home/build/$@ \
 	")
 
-<<<<<<< HEAD
-$(OUT_DIR)/sops: $(FETCH_DIR)/sops
-	$(call toolchain," \
-		cd $(FETCH_DIR)/sops && \
-		export SSL_CERT_DIR=/etc/ssl/certs && \
-		export GOCACHE=/home/build/$(CACHE_DIR) && \
-		export GOPATH=/home/build/$(CACHE_DIR) && \
-		export CGO_ENABLED=0 && \
-=======
-$(FETCH_DIR)/sops:
-	$(call git_clone,$@,$(SOPS_REPO),$(SOPS_REF))
-
 $(OUT_DIR)/sops: $(FETCH_DIR)/sops
 	$(call toolchain," \
 		cd $(FETCH_DIR)/sops && \
 		export CGO_ENABLED=0 && \
 		export GOCACHE=/home/build/$(CACHE_DIR) && \
 		export GOPATH=/home/build/$(CACHE_DIR) && \
->>>>>>> c8a6313 (Makefile: add sops)
 		go build \
 			-v \
 			-trimpath \
 			-ldflags='-w -extldflags=-static' \
-<<<<<<< HEAD
-			-o /home/build/$@ \
-			go.mozilla.org/sops/v3/cmd/sops \
-=======
 			-o /home/build/$@ $(SOPS_PKG) \
->>>>>>> c8a6313 (Makefile: add sops)
 	")