diff --git a/source/3/3.2/3.2.1/abiword.rst b/source/3/3.2/3.2.1/abiword.rst
index a5d92a17..a77bae3d 100644
--- a/source/3/3.2/3.2.1/abiword.rst
+++ b/source/3/3.2/3.2.1/abiword.rst
@@ -13,10 +13,6 @@ Screenshot
 ----------
 .. image:: abiword.png
    :width: 80%
-<<<<<<< HEAD
-=======
-
->>>>>>> eb44904c3fb6a917d77b28527c856bccd5241748
 
 Useage
 ------