This is a test file enter the second step modifying working space managing modification of files new branch <<<<<<< HEAD new conflict fixed branch ======= new conflict fixed branch >>>>>>> feature1 managing branch bug managing done
This is a test file enter the second step modifying working space managing modification of files new branch <<<<<<< HEAD new conflict fixed branch ======= new conflict fixed branch >>>>>>> feature1 managing branch bug managing done