diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e0a0914..fe3044ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+<<<<<<< HEAD
 ### 3.5.1 - [#59](https://github.com/openfisca/country-template/pull/59)
 
 * Technical change
@@ -21,6 +22,17 @@
   - Introduce `code_postal` variable
 
 ### 3.3.2
+=======
+### 3.3.3 - [#56](https://github.com/openfisca/country-template/pull/56)
+
+* Minor change
+* Impacted areas: `setup.cfg`
+* Details:
+  - Sync style check with openfisca-core
+
+
+### 3.3.2 - [#55](https://github.com/openfisca/country-template/pull/55)
+>>>>>>> Bump version to 3.3.3
 
 * Minor change
 * Details:
diff --git a/setup.py b/setup.py
index 525449ab..8ac4debc 100755
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(
+<<<<<<< HEAD
     name = "OpenFisca-Country-Template",
     version = "3.5.1",
     author = "OpenFisca Team",
@@ -18,6 +19,16 @@
     keywords = "benefit microsimulation social tax",
     license ="http://www.fsf.org/licensing/licenses/agpl-3.0.html",
     url = "https://github.com/openfisca/country-template",
+=======
+    name='OpenFisca-Country-Template',
+    version='3.3.3',
+    author='OpenFisca Team',
+    author_email='contact@openfisca.fr',
+    description=u'OpenFisca tax and benefit system for Country-Template',
+    keywords='benefit microsimulation social tax',
+    license='http://www.fsf.org/licensing/licenses/agpl-3.0.html',
+    url='https://github.com/openfisca/country-template',
+>>>>>>> Bump version to 3.3.3
     include_package_data = True,  # Will read MANIFEST.in
     data_files = [
         ("share/openfisca/openfisca-country-template", ["CHANGELOG.md", "LICENSE", "README.md"]),