diff --git a/metadata.rb b/metadata.rb
index e1632ba7..5dabec51 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -88,7 +88,6 @@
   :description => 'Whether or not to make use of Rsyslog privilege separation',
   :default => 'false'
 
-<<<<<<< HEAD
 attribute 'rsyslog/enable_tls',
   :display_name => 'Enable TLS',
   :description => 'Whether or not to enable TLS encryption. When enabled, forces protocol to "tcp"',
@@ -110,9 +109,8 @@
   :display_name => 'TLS auth mode',
   :description => 'Value for "$InputTCPServerStreamDriverAuthMode"/"$ActionSendStreamDriverAuthMode", determines whether client certs are validated.',
   :default => 'anon'
-=======
+
 attribute 'rsyslog/use_local_ipv4',
   :display_name => 'Try to use local IPv4 address',
   :description => 'Whether or not to make use the remote local IPv4 address on cloud systems when searching for servers (where available).',
   :default => 'false'
->>>>>>> pdf-COOK-4022