barnch of dev modify 1.txt add one line
branch of master add a line in 1.txt
conflict fixed