diff --git a/tftp/manifests/init.pp b/tftp/manifests/init.pp
index ef5ad52..42f770c 100644
--- a/tftp/manifests/init.pp
+++ b/tftp/manifests/init.pp
@@ -112,14 +112,7 @@ class tftp::server {
             include inetd::server
             inetd::service { "tftp":
                 ensure  => present,
-<<<<<<< HEAD
-                require => $::operatingsystem ? {
-                    "openbsd" => undef,
-                    default   => Package["tftp-server"],
-                },
-=======
                 require => Package["tftp-server"],
->>>>>>> 7c4f9e6b94793caf3c9369cc0519eefddc54f7d0
             }
         }
     }