diff --git a/bullet.spec b/bullet.spec
index 09fa451..faf65a3 100644
--- a/bullet.spec
+++ b/bullet.spec
@@ -1,11 +1,6 @@
 Name: bullet
-<<<<<<< HEAD
-Version: 2.75
-Release: 4%{?dist}
-=======
 Version: 2.77
 Release: 2%{?dist}
->>>>>>> f14
 Summary: 3D Collision Detection and Rigid Body Dynamics Library
 Group: Development/Libraries
 License: zlib and MIT and BSD
@@ -132,8 +127,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Sep 29 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 2.77-2
 - Added LibSuffix patch
 
@@ -141,7 +134,6 @@ rm -rf $RPM_BUILD_ROOT
 - Updatet to version 2.77
 - Droped all patches because they are all in upstream
 
->>>>>>> f14
 * Sat Aug 21 2010 Thomas Kowaliczek <linuxdonald@linuxdonald.de> - 2.75-4
 - Hope fix (#599495)