Initial.
Conflict resolution