master change commit
new1 commit
conflict resolve change