add dev2.txt in branch2
modify in master
modify in dev1
confilict fixed