diff --git a/gnome-system-monitor.spec b/gnome-system-monitor.spec
index 2680877..0b80d5d 100644
--- a/gnome-system-monitor.spec
+++ b/gnome-system-monitor.spec
@@ -9,13 +9,8 @@
 
 Summary: Simple process monitor
 Name: gnome-system-monitor
-<<<<<<< gnome-system-monitor.spec
 Version: 2.9.90
 Release: 1
-=======
-Version: 2.8.1
-Release: 2
->>>>>>> 1.15
 License: GPL
 Group: Applications/System
 Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2