--- a/gcc/tree.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/tree.c	Tue Nov 28 21:17:15 2017 +0900
@@ -106,7 +106,7 @@
 #undef END_OF_BASE_TREE_CODES
 
 #ifndef noCbC
-#include "cbc-tree.h"
+#include "c/cbc-tree.h"
 #endif
 
 /* Each tree code class has an associated string representation.
@@ -11493,7 +11493,6 @@
   return NULL;
 }
 
-<<<<<<< local
 void
 tree_set_block (tree t, tree b)
 {
@@ -11507,24 +11506,6 @@
     gcc_unreachable ();
 }
 
-=======
-/* Build and return a TREE_LIST of arguments in the CALL_EXPR exp.                                                                    
-   FIXME: don't use this function.  It exists for compatibility with                                                                  
-   the old representation of CALL_EXPRs where a list was used to hold the                                                             
-   arguments.  Places that currently extract the arglist from a CALL_EXPR                                                             
-   ought to be rewritten to use the CALL_EXPR itself.  */
-tree
-call_expr_arglist (tree exp)
-{
-  tree arglist = NULL_TREE;
-  int i;
-  for (i = call_expr_nargs (exp) - 1; i >= 0; i--)
-    arglist = tree_cons (NULL_TREE, CALL_EXPR_ARG (exp, i), arglist);
-  return arglist;
-}
-
-
->>>>>>> other
 /* Create a nameless artificial label and put it in the current
    function context.  The label has a location of LOC.  Returns the
    newly created label.  */