diff --git a/themes/learn2/css/custom.css b/themes/learn2/css/custom.css
index 62dd514..4910fb3 100644
--- a/themes/learn2/css/custom.css
+++ b/themes/learn2/css/custom.css
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-=======
 /*
-===============================================================================================================================
 Put your custom CSS in this file.
-===============================================================================================================================
 */
 
 /* sidebar big lower portion */
@@ -152,7 +148,6 @@ blockquote {
 }*/
 
 /* random stuff */
->>>>>>> parent of e861ead (Reset to default theme)
 .highlightable {
     overflow: auto;
 }