Fix various conflicts.