diff --git a/lib/linters/single_line_per_selector.js b/lib/linters/single_line_per_selector.js
index <HASH>..<HASH> 100644
--- a/lib/linters/single_line_per_selector.js
+++ b/lib/linters/single_line_per_selector.js
@@ -18,9 +18,6 @@ module.exports = {
                 element = node.get(index - 1);
             }
 
-<<<<<<< HEAD
-            if (element.content.indexOf('\n') === -1) {
-=======
             switch (config.style) {
                 case '18f':
                     node.forEach('selector', function (selector) {
@@ -40,7 +37,6 @@ module.exports = {
             }
 
             if (report && element.content.indexOf('\n') === -1) {
->>>>>>> singleLinePerSelector-18f-option
                 results.push({
                     column: element.start.column,
                     line: element.start.line,
Remove stray Git conflict markers