--- a/gcc/passes.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/passes.c	Tue Nov 28 21:17:15 2017 +0900
@@ -1541,7 +1541,6 @@
   all_late_ipa_passes (NULL), passes_by_id (NULL), passes_by_id_size (0),
   m_ctxt (ctxt), m_name_to_pass_map (NULL)
 {
-<<<<<<< local
   opt_pass **p;
 
   /* Zero-initialize pass members.  */
@@ -1623,39 +1622,6 @@
 delete_pass_tree (opt_pass *pass)
 {
   while (pass)
-=======
-  struct opt_pass **p;
-
-#define NEXT_PASS(PASS)  (p = next_pass_1 (p, &((PASS).pass)))
-
- /* All passes needed to lower the function into shape optimizers can
-    operate on.  These passes are always run first on the function, but
-    backend might produce already lowered functions that are not processed
-    by these passes.  */
-  p = &all_lowering_passes;
-  NEXT_PASS (pass_warn_unused_result);
-  NEXT_PASS (pass_diagnose_omp_blocks);
-  NEXT_PASS (pass_mudflap_1);
-  NEXT_PASS (pass_lower_omp);
-  NEXT_PASS (pass_lower_cf);
-  NEXT_PASS (pass_refactor_eh);
-  NEXT_PASS (pass_lower_eh);
-  NEXT_PASS (pass_build_cfg);
-
-#ifndef noCbC
-  //NEXT_PASS (pass_warn_function_return);
-#else
-  NEXT_PASS (pass_warn_function_return);
-#endif
-  NEXT_PASS (pass_build_cgraph_edges);
-  *p = NULL;
-
-  /* Interprocedural optimization passes.  */
-  p = &all_small_ipa_passes;
-  NEXT_PASS (pass_ipa_free_lang_data);
-  NEXT_PASS (pass_ipa_function_and_variable_visibility);
-  NEXT_PASS (pass_early_local_passes);
->>>>>>> other
     {
       /* Recurse into child passes.  */
       delete_pass_tree (pass->sub);