Conflict solving working