line1 line2 <<<<<<< HEAD line3 line4 line5 line6 ======= line3 lineB line5 line6 >>>>>>> PATCH line7 line8