ticket:10 Conflict resolution