Conflict fix