edit from master
edit testing.txt from master
edit from br1
conflict testing.txt
edit Untitled.txt from br1
remote conflict merged