diff --git a/README.md b/README.md
index 358932702a6c841c785af4b7b8cfebf8ae9afb18..6159c46f4c13753ff0889841e5bb4700bbd039c0 100644
--- a/README.md
+++ b/README.md
@@ -62,9 +62,4 @@ See misc folder For some screenshot
  - NoVNC console integration (stuck for the moment ... :( )
 
 # License
-<<<<<<< HEAD
 Copyright (c) 2017, Oricom Internet
-=======
-Copyright (c) 2016, GodY
->>>>>>> 45069feb7d44682f700806891cf063cb5671d74a
-All rights reserved.