diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb1b2ef..f1c6ffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## [1.1.2] - 2015-10-09
 ### ADDED
 - `Image` objects now have a `frame_number` attribute.
@@ -10,6 +11,8 @@
 - The `data` attribute is no longer needed since `Image` is now a Numpy array.
 - The `image_sets` iterator will be removed in the near future. You should implement this yourself.
 
+=======
+>>>>>>> origin/master
 ## [1.1.1] - 2015-09-02
 ### FIXED
 - Images returned by indexing would sometimes be skipped when the file contained multiple channels
diff --git a/setup.py b/setup.py
index d5feeaa..1f246f4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,10 @@
 from setuptools import setup
 
+<<<<<<< HEAD
 VERSION = "1.1.2"
+=======
+VERSION = "1.1.1"
+>>>>>>> origin/master
 
 setup(
     name="nd2reader",