diff --git a/NEWS b/NEWS
index f411f0f36905c66b95f9692af46aa9828d535c97..86ed5661582e39b340a7a39290a28feba7c54ad5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,3 @@
-<<<<<<< HEAD
-Version 1.7.7
-=============
-
-	* Fix CVS export [issue #348]
-	* Adapt to PSUtil 2.1.1
-	* Compatibility with Python 3.4
-	* Improve German update
-=======
 ==============================================================================
 Glances Version 2.x
 ==============================================================================
@@ -74,37 +65,24 @@ Glances Version 1.x
 Version 1.7.7
 =============
 
-* Fix CVS export [issue #348]
-* Adapt to PSUtil 2.1.1
-* Compatibility with Python 3.4
-* Improve German update
->>>>>>> release/v2.0
+    * Fix CVS export [issue #348]
+    * Adapt to PSUtil 2.1.1
+    * Compatibility with Python 3.4
+    * Improve German update
 
 Version 1.7.6
 =============
 
-<<<<<<< HEAD
-    *  Adapt to psutil 2.0.0 API
-    *  Fixed psutil 0.5.x support on Windows
-    *  Fix help screen in 80x24 terminal size
-    *  Implement toggle of process list display ('z' key)
-=======
     * Adapt to psutil 2.0.0 API
     * Fixed psutil 0.5.x support on Windows
     * Fix help screen in 80x24 terminal size
     * Implement toggle of process list display ('z' key)
->>>>>>> release/v2.0
 
 Version 1.7.5
 =============
 
-<<<<<<< HEAD
-    *  Force the Pypi installer to use the PsUtil branch 1.x (#333)
-
-=======
     * Force the Pypi installer to use the PsUtil branch 1.x (#333)
     
->>>>>>> release/v2.0
 Version 1.7.4
 =============