feature branch 1 commit
master branch 1 commit
conflict fixed