foxtrot
foxtrot
foxtrot
foxtrot
foxtrot
<<<<<<< B
changed-by-B
=======
changed-by-A
>>>>>>> A
