diff --git a/bin/check-graphite-data.rb b/bin/check-graphite-data.rb
index d1f3c2a..52fef85 100755
--- a/bin/check-graphite-data.rb
+++ b/bin/check-graphite-data.rb
@@ -85,7 +85,6 @@ def check_age
     end
   end
 
-<<<<<<< HEAD
   # grab data from graphite
   def retrieve_data
     unless @raw_data
@@ -153,14 +152,6 @@ def retrieve_data
   def check(type)
     if config[type]
       send(type, "#{@value['target']} has passed #{type} threshold (#{@data.last})") if below?(type) || above?(type)
-=======
-  # type:: :warning or :critical
-  # Return alert if required
-  def check(type)
-    # #YELLOW
-    if config[type] # rubocop:disable GuardClause
-      send(type, "value (#{@data.last}) for #{@value['target']} has passed #{type} threshold (#{config[type]})") if below?(type) || above?(type)
->>>>>>> b6a092adbb33662ed331e5d97cb0a7b69f0c9cfe
     end
   end
 
diff --git a/lib/sensu-plugins-graphite/graphite_proxy/proxy.rb b/lib/sensu-plugins-graphite/graphite_proxy/proxy.rb
index d1ac86c..5fcccd3 100644
--- a/lib/sensu-plugins-graphite/graphite_proxy/proxy.rb
+++ b/lib/sensu-plugins-graphite/graphite_proxy/proxy.rb
@@ -76,8 +76,7 @@ def output_line(raw)
 
       # grab data from graphite
       def retrieve_data!
-        # #YELLOW
-        unless @raw_data # rubocop:disable GuardClause
+        unless @raw_data
           begin
             unless config[:server].start_with?('https://', 'http://')
               config[:server].prepend('http://')