local merge conflict resolved