remotes navigation in progress
conflict resolution