--- a/gcc/c-family/c-pretty-print.c	Fri Nov 10 19:46:38 2017 +0900
+++ b/gcc/c-family/c-pretty-print.c	Fri Nov 17 06:33:55 2017 +0900
@@ -28,17 +28,9 @@
 #include "attribs.h"
 #include "intl.h"
 #include "tree-pretty-print.h"
-<<<<<<< local
-=======
-#include "tree-iterator.h"
-#include "diagnostic.h"
 #ifndef noCbC
 #include "cbc-tree.h"
 #endif
-/* Translate if being used for diagnostics, but not for dump files or
-   __PRETTY_FUNCTION.  */
-#define M_(msgid) (pp_translate_identifiers (pp) ? _(msgid) : (msgid))
->>>>>>> other
 
 /* The pretty-printer code is primarily designed to closely follow
    (GNU) C and C++ grammars.  That is to be contrasted with spaghetti
@@ -552,15 +544,7 @@
     {
       if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE
 	  || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
-<<<<<<< local
 	pp_c_right_paren (this);
-=======
-	pp_c_right_paren (pp);
-#ifndef noCbC
-      if(IS_RECTYPE(t)) 
-	return;
-#endif
->>>>>>> other
       t = TREE_TYPE (t);
     }