resolve conflict local to remote