source locally
merge conflict resolved