diff --git a/modules/quotes/quotes.js b/modules/quotes/quotes.js
index 8192baf..ffa5372 100644
--- a/modules/quotes/quotes.js
+++ b/modules/quotes/quotes.js
@@ -9,7 +9,6 @@ var quotes = function(dbot) {
     this.rmTimer;
 
     this.internalAPI = {
-<<<<<<< HEAD
         // Parse quote interpolations
         'interpolatedQuote': function(server, channel, key, quote, callback) {
             var quoteRefs = quote.match(/~~([\d\w\s-]*)~~/g);