diff --git a/xubuntu-XPS-13-7390-2-in-1--.md b/xubuntu-XPS-13-7390-2-in-1--.md
index 3e08bf6..f212005 100644
--- a/xubuntu-XPS-13-7390-2-in-1--.md
+++ b/xubuntu-XPS-13-7390-2-in-1--.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Xubuntu on XPS 13 7390 2 in 1 
 ## sources
 * [Gentoo wiki -  Dell XPS 13 2-in-1 (7390)](https://wiki.gentoo.org/wiki/Dell_XPS_13_2-in-1_(7390))