New file added for first time
Content added to new.txt
Added second line
Adding third line in master to check conflict
conflict file added
Conflict removed