diff --git a/mpg123.spec b/mpg123.spec
index 12062b9..2807ce3 100644
--- a/mpg123.spec
+++ b/mpg123.spec
@@ -3,13 +3,9 @@
 %global syn syn123
 
 Name: mpg123
-<<<<<<< HEAD
 Version: 1.31.3
 Release: 1%{?dist}
-=======
-Version: 1.31.2
-Release: 2%{?dist}
->>>>>>> 0ee0e45443e28f6eb96a65ed22219b1702e8d994
+
 Summary: Real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3
 License: LGPLv2+
 URL: https://mpg123.org