Another try to fix priorities for conflicts.