diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
index 43479e574..a6810c2a2 100644
--- a/manifests/resource/location.pp
+++ b/manifests/resource/location.pp
@@ -25,7 +25,7 @@
 #    location => '/bob',
 #    vhost    => 'test2.local',
 #  }
-<<<<<<< HEAD
+
 define nginx::resource::location(
   $ensure             = present,
   $vhost              = undef,