<<<<<<< HEAD:file.txt Current change [YOUR LOCAL DATA] ======= Incoming change [DATA FROM ANOTHER COMMIT] >>>>>>> d34db33f:file.txt