switch to remote db / merge conflict resolved