More improvements
Conflict resolution