TODO
Conflict resolution