Fix conflicts because @JoeyHill is a smart guy, but so dumb at git