diff --git a/golang-github-pkg-xattr.spec b/golang-github-pkg-xattr.spec
index 19f6ddf..6503584 100644
--- a/golang-github-pkg-xattr.spec
+++ b/golang-github-pkg-xattr.spec
@@ -5,7 +5,7 @@ Version:        0.3.1
 %gometa -i
 
 Name:           %{goname}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Extended attribute support library for Go
 License:        BSD
 URL:            %{gourl}
@@ -47,14 +47,11 @@ building other packages which use import path with
 %doc README.md
 
 %changelog
-<<<<<<< HEAD
-* Thu Jun 14 2018 Steve Miller (copart) <code@rellims.com> - 0.3.1-1
+* Sun Oct 14 2018 Steve Miller (copart) <code@rellims.com> - 0.3.1-1
 - Bumped upstream version, bug fix release
-=======
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - Forge-specific packaging variables
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
->>>>>>> 8012267b3cbf4603c269a9b70698d21a2e1fc9e3
 
 * Thu Jun 14 2018 Steve Miller (copart) <code@rellims.com> - 0.3.0-1
 - First package for Fedora
-