diff --git a/config/environments/ci.rb b/config/environments/ci.rb
index ab04be03..8787f611 100755
--- a/config/environments/ci.rb
+++ b/config/environments/ci.rb
@@ -1,6 +1,5 @@
 # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later
 Commitchange::Application.configure do
-<<<<<<< HEAD
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
@@ -57,5 +56,4 @@ Commitchange::Application.configure do
   config.after_initialize do
     ActiveRecord::Base.logger = nil
   end
-
 end