merge conflict resolved