diff --git a/patches/patch_list.py b/patches/patch_list.py
index 7ff4611e580..c9a4294bfb2 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -560,11 +560,11 @@ patch_list = [
 	},
 	{
 		'patch_module': 'patches.december_2012',
-<<<<<<< HEAD
 		'patch_file': 'address_title',
-=======
+	},
+	{
+		'patch_module': 'patches.december_2012',
 		'patch_file': 'delete_form16_print_format',
->>>>>>> a85b2e4ee349c544acb7a1949351e9a7c70f7b7c
 	},
 	{
 		'patch_module': 'patches.december_2012',