diff --git a/atomic.spec b/atomic.spec
index bfe7078..8e45695 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -11,23 +11,11 @@
 %global __python %{__python3}
 %endif
 
-<<<<<<< HEAD
-%global commit 3391fc2c25a21f2c73d923bbbfe5eec2fa02be7c
-||||||| merged common ancestors
-%global commit a16f089a25ff888294d398c16de63a32b70aceba
-=======
 %global commit e7f78948a00571b8aca797e0dcaa362d36f5493e
->>>>>>> b469756e1ccd3eebd0f52d24883eaed81c747a3a
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: atomic
-<<<<<<< HEAD
-Version: 1.16.2
-||||||| merged common ancestors
-Version: 1.16.1
-=======
 Version: 1.16.3
->>>>>>> b469756e1ccd3eebd0f52d24883eaed81c747a3a
 Release: 1%{?dist}
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
@@ -164,16 +152,6 @@ EOF
 %dir %{_sharedstatedir}/containers/%{name}
 
 %changelog
-<<<<<<< HEAD
-* Wed Mar 1 2017 Dan Walsh <dwalsh@redhat.com> - 1.16.2-1
-- bump to v1.16.1
--    Fix lots of atomic storage bugs
--    syscontainers: when using --rootfs create a symlink to rootfs
--    Allow systemcontainers to be atomic mounted, and use them in scan
--    Fix output for --json args
-
-||||||| merged common ancestors
-=======
 * Thu Mar 9 2017 Dan Walsh <dwalsh@redhat.com> - 1.16.3-1
 - bump to v1.16.1
 -   Fix str/byte exception with fingerprint
@@ -193,7 +171,6 @@ EOF
 -    Allow systemcontainers to be atomic mounted, and use them in scan
 -    Fix output for --json args
 
->>>>>>> b469756e1ccd3eebd0f52d24883eaed81c747a3a
 * Thu Feb 23 2017 Dan Walsh <dwalsh@redhat.com> - 1.16.1-1
 - bump to v1.16.1
 -    Fix uninstall bug: BZ 1425495
diff --git a/sources b/sources
index cd3239d..f4236ab 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (d56dcfb435ae13f834d76809ae967a2249e1073b.tar.gz) = 43981750a1cb451c1b33bd35a1d00aca77be2b7e7a3b3e883cb06b43e93eb99eda1766ebb6c9258d1c65854f518150ee75793f89b008cdd62f96059c3ec62fab
 SHA512 (a16f089a25ff888294d398c16de63a32b70aceba.tar.gz) = 90fd6fd42b27cb7210e5a92d10917ca16cd2005d651ecebb422f8bd6f0b87cf161293322daef62cc05fc039a5d75671762e525ba156c8cc3cd02855c0f1cc730
 SHA512 (3391fc2c25a21f2c73d923bbbfe5eec2fa02be7c.tar.gz) = dba1467680c4b35cb97fb90472595bc543e9e3a84c8f2e16b35150bdad0a3cc35dbfdd35aee9dac0a5fa585784e54e3668169ed219e1811ff57aa6e17af11ff2
+SHA512 (e7f78948a00571b8aca797e0dcaa362d36f5493e.tar.gz) = 279320372abba48a31a5ade40fb1826943a6723784248886395c891af758b8f5bd03b7c4046d9626a71787929c326415058937f24f0bcda6ec29ad4a913e6c0e