Re-add damn merge conflicts