diff --git a/lib/vendor/fssm.rb b/lib/vendor/fssm.rb
index 4044e014..faf3fd1b 100644
--- a/lib/vendor/fssm.rb
+++ b/lib/vendor/fssm.rb
@@ -39,7 +39,3 @@ require 'fssm/monitor'
 
 require "fssm/backends/#{FSSM::Support.backend.downcase}"
 FSSM::Backends::Default = FSSM::Backends.const_get(FSSM::Support.backend)
-<<<<<<< HEAD:lib/vendor/fssm.rb
-=======
-
->>>>>>> edge:lib/vendor/fssm.rb