new commit
conflict resolved
pushed into master