fix: Invalid conflict marker

bin/tests/scenarios/left_deletes_changed_node_in_right/merge.java

@@ -1,6 +1,6 @@
   class Test  { 
-<<<<<<<<<
-=========
+<<<<<<<
+=======
   public static void main  ( )  {    System . out . println  ( "Hello, Joao!" ) ; }
->>>>>>>>>
+>>>>>>>
  }

bin/tests/scenarios/method_parameters_differ_on_final_keyword/merge.java

@@ -1 +1 @@
-public abstract class Artifact  {   public abstract T addChild  (  T child ) ; }
+   public abstract class Artifact  {   public abstract T addChild  (  T child ) ; }

bin/tests/scenarios/right_deletes_changed_node_in_left/merge.java

@@ -1,6 +1,6 @@
   class Test  { 
-<<<<<<<<<
+<<<<<<<
   public static void main  ( )  {    System . out . println  ( "Hello, Joao!" ) ; }
-=========
->>>>>>>>>
+=======
+>>>>>>>
  }

bin/tests/scenarios/semi_structured/merge.java

@@ -1,7 +1,7 @@
    public class Test  {   long fibo  (   int n )  {  if  (  n < 2 )  {  return n ; } else  {  return   fibo  (  n - 1 ) +  fibo  (  n - 2 ) ; } }   int calc  (   int a ,   int b )  {  return  a 
-<<<<<<<<<
+<<<<<<<
 +
-=========
+=======
 *
->>>>>>>>>
+>>>>>>>
  b ; } }

bin/tests/scenarios/smoke_java/merge.java

@@ -1,13 +1,13 @@
    public class Main  {  void delete  (  Pessoa pessoa ) ;  void create  (  Pessoa pessoa ) ;   public static void main  (   String  [ ] args )  {   int  x = 0 ;    System . out . println  ( 
-<<<<<<<<<
+<<<<<<<
 "Hello, João!"
-=========
+=======
 "Hello, Paulo!"
->>>>>>>>>
+>>>>>>>
  ) ;   int  y = 
-<<<<<<<<<
+<<<<<<<
 3
-=========
+=======
 5
->>>>>>>>>
+>>>>>>>
  ; }  void upsert  (  Pessoa pessoa ) ; }

bin/tests/scenarios/unordered_with_non_labelled/merge.java

@@ -1,13 +1,13 @@
    public class Main  {  static  {   int  
-<<<<<<<<<
+<<<<<<<
 x
-=========
+=======
 y
->>>>>>>>>
+>>>>>>>
  = 
-<<<<<<<<<
+<<<<<<<
 0
-=========
+=======
 2
->>>>>>>>>
+>>>>>>>
  ; }  static  {    System . out . println  ( "I'm a static block" ) ; }   public Main  ( )  {    System . out . println  ( "I'm a constructor" ) ;   int  y = 3 ; }  static  {    System . out . println  ( "I don't know what's going on" ) ; } }

merge/src/merged_cst_node.rs

@@ -61,25 +61,25 @@ impl Display for MergedCSTNode<'_> {
             MergedCSTNode::Conflict { left, right } => match (left, right) {
                 (Some(left), Some(right)) => {
                     writeln!(f)?;
-                    writeln!(f, "<<<<<<<<<")?;
+                    writeln!(f, "<<<<<<<")?;
                     writeln!(f, "{}", left)?;
-                    writeln!(f, "=========")?;
+                    writeln!(f, "=======")?;
                     writeln!(f, "{}", right)?;
-                    writeln!(f, ">>>>>>>>>")
+                    writeln!(f, ">>>>>>>")
                 }
                 (Some(left), None) => {
                     writeln!(f)?;
-                    writeln!(f, "<<<<<<<<<")?;
+                    writeln!(f, "<<<<<<<")?;
                     writeln!(f, "{}", left)?;
-                    writeln!(f, "=========")?;
-                    writeln!(f, ">>>>>>>>>")
+                    writeln!(f, "=======")?;
+                    writeln!(f, ">>>>>>>")
                 }
                 (None, Some(right)) => {
                     writeln!(f)?;
-                    writeln!(f, "<<<<<<<<<")?;
-                    writeln!(f, "=========")?;
+                    writeln!(f, "<<<<<<<")?;
+                    writeln!(f, "=======")?;
                     writeln!(f, "{}", right)?;
-                    writeln!(f, ">>>>>>>>>")
+                    writeln!(f, ">>>>>>>")
                 }
                 (None, None) => unreachable!("Invalid conflict provided"),
             },