branch test
feature1 commit
& simple
conflict fixed