diff --git a/patches/patch_list.py b/patches/patch_list.py
index 93e5a76bff..1b4f762d5b 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -576,10 +576,19 @@ patch_list = [
 	},
 	{
 		'patch_module': 'patches.january_2013',
+<<<<<<< HEAD
 		'patch_file': 'remove_bad_permissions',
 	},	
 	{
 		'patch_module': 'patches.january_2013',
 		'patch_file': 'deprecate_stock_search_criteria',
 	},
+=======
+		'patch_file': 'deprecate_stock_search_criteria',
+	},
+	{
+		'patch_module': 'patches.january_2013',
+		'patch_file': 'remove_bad_permissions',
+	},	
+>>>>>>> 93a02a3995e93ec0915d99ecfeabf456b65591b4
 ]
\ No newline at end of file