merge conflict resoleved