branch dev
empty thirdtrip.txt
modify thirdtrip.txt
dev commit
dev commit:
solve confilict
dev add
master add
solve confilict: