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