diff --git a/app/models/repository.rb b/app/models/repository.rb
index 538d91a77d73abb672de2e2206c6b119a195718d..01a6bbb511086ef7a016523bbc3d7025f1a51825 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -739,15 +739,31 @@ class Repository
       options[:author] = committer
       options[:commit] = {
         message: message,
+<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945
         branch: ref
       }
 
+=======
+        branch: ref,
+      }
+
+      if previous_path
+        options[:file] = {
+          path: previous_path
+        }
+
+
+        Gitlab::Git::Blob.remove(raw_repository, options)
+      end
+
+>>>>>>> creates the update_file method in repository.rb and applies changes accordingly
       options[:file] = {
         content: content,
         path: path,
         update: true
       }
 
+<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945
       if previous_path
         options[:file][:previous_path] = previous_path