finished remotes
start section on conflict resolution