Working out conflicts