Conflict resolution

shape