branch test
and simple
& simple
conflict fixed
fix bug1
merged fix bug1
bugg
confixed