Conflict solved!