diff --git a/python-fasteners.spec b/python-fasteners.spec
index bd9f4d1..1321dc8 100644
--- a/python-fasteners.spec
+++ b/python-fasteners.spec
@@ -111,9 +111,13 @@ nosetests-3.4
 
 
 %changelog
+<<<<<<< HEAD
 * Mon Jun 22 2015 Matthias Runge <mrunge@redhat.com> - 0.12.0-1
 - update to 0.12.0 (rhbz#1234253)
 
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Fri Jun 12 2015 Matthias Runge <mrunge@redhat.com> - 0.9.0-2
 - switch to github sourcecode, license included
 - add tests, fix conditionals for python3