diff --git a/sass/_display.scss b/sass/_display.scss
index e98d846..1d21c02 100644
--- a/sass/_display.scss
+++ b/sass/_display.scss
@@ -54,11 +54,3 @@
   .dtcol-l {  display: table-column; }
   .dtcolg-l { display: table-column-group; }
 }
-<<<<<<< HEAD
-
-
-
-
-
-=======
->>>>>>> master