diff --git a/docs/u_and_e.md b/docs/u_and_e.md
index 2470cd14..fe4a3913 100644
--- a/docs/u_and_e.md
+++ b/docs/u_and_e.md
@@ -52,8 +52,7 @@ curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose versio
 Edit a domain as (domain) administrator to add an item to the filter table.
 
 Beware that a mailbox user can login to mailcow and override a domain policy filter item. 
-<<<<<<< HEAD
-
+
 ## Change default language
 
 Change `data/conf/sogo/sogo.conf` and replace "English" by your prefered language.