diff --git a/build.rb b/build.rb
index 77bca10..4edb695 100644
--- a/build.rb
+++ b/build.rb
@@ -229,7 +229,6 @@ class Server
         listener
     end
 
-<<<<<<< HEAD
     def run(options)
         require 'webrick'
 	listener = options[:watch] && start_watcher