diff --git a/css/history.css b/css/history.css
index 6a45c56aa69bc05c58374f40f6a1168488162648..0154a7f0a6c9193f49132000bc3a762cd0b9aac6 100755
--- a/css/history.css
+++ b/css/history.css
@@ -40,8 +40,6 @@
 .history_menu > h3 {
 	margin: 5px 1px;
 }
-<<<<<<< HEAD
-=======
 
 #history_table_container {
 	overflow-y: auto;