diff --git a/atomic.spec b/atomic.spec
index 21b8837..bfe7078 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -11,11 +11,23 @@
 %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+
@@ -152,6 +164,7 @@ 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
@@ -159,6 +172,28 @@ EOF
 -    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
+-   Atomic/discovery.py: Fix exception with FQDN in atomic sign
+-   Small fix to image info
+-   Report an error when no applicable registries.d configuration exists
+-   Fix debug output when in RegistryInspect.find_image_on_registry
+-   Allow returning raw bytes from RegistryInspect.get_manifest
+-   syscontainers: do not fail if Docker is not running
+-   syscontainers: add a warning if the image is not a system container
+-   Atomic/scan.py: Fix KeyError for uuid
+
+* 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
+
+>>>>>>> b469756e1ccd3eebd0f52d24883eaed81c747a3a
 * Thu Feb 23 2017 Dan Walsh <dwalsh@redhat.com> - 1.16.1-1
 - bump to v1.16.1
 -    Fix uninstall bug: BZ 1425495