Conflict resolved