123.txt
test branch
hello world
123.txt adding ---
master 123.txt adding ++
confliction in 123.txt solved