demo1.txt.orig

first file, modified on local
bob change the file, adding line to check pull commad
<<<<<<< HEAD
Alice change the file, editing in 1st terminal
=======
Alice change the file, editing 2nd terminal
>>>>>>> edit in 2nd terminal
modofication for remote topic, another modification for fetch command