Conflict sorted"