branch test
dev1
dev2
conflict fixed