diff --git a/firefox.spec b/firefox.spec
index 295800f..145d763 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -89,13 +89,8 @@ ExcludeArch: s390x
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-<<<<<<< HEAD
-Version:        68.0.1
-Release:        4%{?pre_tag}%{?dist}
-=======
 Version:        68.0.2
 Release:        1%{?pre_tag}%{?dist}
->>>>>>> master
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz