Remove conflict

frappe/custom/doctype/custom_script/custom_script.json

@@ -87,11 +87,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-<<<<<<< HEAD
-=======
+   "in_filter": 0,
    "in_global_search": 0, 
->>>>>>> Hide script field from List View
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Script",