git branch test
merge branch
dev1 meger
merge the conflict branch