diff --git a/backend/s3/s3.go b/backend/s3/s3.go
index e9e0c0120..d85c11f2f 100644
--- a/backend/s3/s3.go
+++ b/backend/s3/s3.go
@@ -102,15 +102,9 @@ func (bb *s3Blob) Finalize(t backend.Type, name string) error {
 	path := s3path(t, name)
 
 	// Check key does not already exist
-<<<<<<< HEAD
 	_, err := bb.b.bucket.GetReader(path)
 	if err == nil {
 		return errors.New("key already exists!")
-=======
-	key, err := bb.b.bucket.GetKey(path)
-	if err == nil && key.Key == path {
-		return errors.New("key already exists")
->>>>>>> integrated the comments from the review, simplified the backend and added some documentation
 	}
 
 	<-bb.b.connChan
diff --git a/cmd/restic/global.go b/cmd/restic/global.go
index f8e1beecf..a612849e1 100644
--- a/cmd/restic/global.go
+++ b/cmd/restic/global.go
@@ -136,15 +136,12 @@ func (o GlobalOptions) OpenRepository() (*repository.Repository, error) {
 // * sftp://host//tmp/backup -> remote sftp repository on host at path /tmp/backup
 // * http://host -> remote and public http repository
 func open(u string) (backend.Backend, error) {
-<<<<<<< HEAD
 	// check if the url is a directory that exists
 	fi, err := os.Stat(u)
 	if err == nil && fi.IsDir() {
 		return local.Open(u)
 	}
 
-=======
->>>>>>> integrated the comments from the review, simplified the backend and added some documentation
 	url, err := url.Parse(u)
 	if err != nil {
 		return nil, err