diff --git a/.gitignore b/.gitignore
index 618c207..a6b3d44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,12 @@
 /68ed6292629b6b81a0038401340f6285c897884e.tar.gz
 /2ebeb1decd15ed808b41e9b7ff52ef478d8c614d.tar.gz
 /a21f0bc7a69baafb87d247ad87a6eabfb551d431.tar.gz
+<<<<<<< HEAD
 /d56dcfb435ae13f834d76809ae967a2249e1073b.tar.gz
 /a16f089a25ff888294d398c16de63a32b70aceba.tar.gz
 /3391fc2c25a21f2c73d923bbbfe5eec2fa02be7c.tar.gz
 /e7f78948a00571b8aca797e0dcaa362d36f5493e.tar.gz
+||||||| merged common ancestors
+=======
+/d56dcfb435ae13f834d76809ae967a2249e1073b.tar.gz
+>>>>>>> 89bd2d72222e284c02cd6387691781425f87fa7b
diff --git a/atomic.spec b/atomic.spec
index 8e45695..d975764 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -11,12 +11,26 @@
 %global __python %{__python3}
 %endif
 
+<<<<<<< HEAD
 %global commit e7f78948a00571b8aca797e0dcaa362d36f5493e
+||||||| merged common ancestors
+%global commit a21f0bc7a69baafb87d247ad87a6eabfb551d431
+=======
+%global commit d56dcfb435ae13f834d76809ae967a2249e1073b
+>>>>>>> 89bd2d72222e284c02cd6387691781425f87fa7b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: atomic
+<<<<<<< HEAD
 Version: 1.16.3
 Release: 1%{?dist}
+||||||| merged common ancestors
+Version: 1.15.3
+Release: 2%{?dist}
+=======
+Version: 1.15.4
+Release: 1%{?dist}
+>>>>>>> 89bd2d72222e284c02cd6387691781425f87fa7b
 Summary: Tool for managing ProjectAtomic systems and containers
 License: LGPLv2+
 URL: https://github.com/projectatomic/atomic
@@ -152,6 +166,7 @@ EOF
 %dir %{_sharedstatedir}/containers/%{name}
 
 %changelog
+<<<<<<< HEAD
 * Thu Mar 9 2017 Dan Walsh <dwalsh@redhat.com> - 1.16.3-1
 - bump to v1.16.1
 -   Fix str/byte exception with fingerprint
@@ -187,6 +202,12 @@ EOF
 * Fri Feb 17 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.15.4-1
 - bump to v1.15.4
 
+||||||| merged common ancestors
+=======
+* Fri Feb 17 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.15.4-1
+- bump to v1.15.4
+
+>>>>>>> 89bd2d72222e284c02cd6387691781425f87fa7b
 * Wed Feb 8 2017 Dan Walsh <dwalsh@redhat.com> - 1.15.3-2
 - Forgot to bump version
 
diff --git a/sources b/sources
index f4236ab..8d7b462 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,13 @@
+<<<<<<< HEAD
 SHA512 (d56dcfb435ae13f834d76809ae967a2249e1073b.tar.gz) = 43981750a1cb451c1b33bd35a1d00aca77be2b7e7a3b3e883cb06b43e93eb99eda1766ebb6c9258d1c65854f518150ee75793f89b008cdd62f96059c3ec62fab
 SHA512 (a16f089a25ff888294d398c16de63a32b70aceba.tar.gz) = 90fd6fd42b27cb7210e5a92d10917ca16cd2005d651ecebb422f8bd6f0b87cf161293322daef62cc05fc039a5d75671762e525ba156c8cc3cd02855c0f1cc730
 SHA512 (3391fc2c25a21f2c73d923bbbfe5eec2fa02be7c.tar.gz) = dba1467680c4b35cb97fb90472595bc543e9e3a84c8f2e16b35150bdad0a3cc35dbfdd35aee9dac0a5fa585784e54e3668169ed219e1811ff57aa6e17af11ff2
 SHA512 (e7f78948a00571b8aca797e0dcaa362d36f5493e.tar.gz) = 279320372abba48a31a5ade40fb1826943a6723784248886395c891af758b8f5bd03b7c4046d9626a71787929c326415058937f24f0bcda6ec29ad4a913e6c0e
+||||||| merged common ancestors
+SHA512 (fcfe13227d47c4bbbc60e99a62e8db4e3ee28850.tar.gz) = faea867132ee97ee9dbd4adb62bf8c329b572e5e7c01892e03d6b3c24994b7238e1e733a9b7e479d4ebf9f4ebe8a0ea189c9ab5d1b920fc4ae6fef681b6d4a76
+SHA512 (68ed6292629b6b81a0038401340f6285c897884e.tar.gz) = 7058ee621020ae69e82bf9f53860da386cb5f243ad7bb06c22933031f56952ffc2c7ccda09c7742665a4e1a4fa7fdf4448963a8c97a16309f38e46ffe77c49f3
+SHA512 (2ebeb1decd15ed808b41e9b7ff52ef478d8c614d.tar.gz) = 69ea6f436ea2c445b457358b160de045387ba80cfefb00d6adc7bfc2b6bae66f2e9a0d9bcbe7231cfdf30273f68a35e7ccd7dbe09096ad8fd3a509d4f3c588bd
+SHA512 (a21f0bc7a69baafb87d247ad87a6eabfb551d431.tar.gz) = bd3f68fd2c1ec495dc2f838bef29ff49d4dd6feda365b03fc25750cafa4585833d21e8463ef5d6d9b763b34151cc77a8b4dda2d0cbf5825173708ba47131d61e
+=======
+SHA512 (d56dcfb435ae13f834d76809ae967a2249e1073b.tar.gz) = 43981750a1cb451c1b33bd35a1d00aca77be2b7e7a3b3e883cb06b43e93eb99eda1766ebb6c9258d1c65854f518150ee75793f89b008cdd62f96059c3ec62fab
+>>>>>>> 89bd2d72222e284c02cd6387691781425f87fa7b