Fix those damn merge conflicts.