Add "conflicts:" where needed.