Fix explicit conflicts handling.
Rework remote conflicts.