fixed some merge conflicts

What does the fox say.

BEEG DEJG AJSFJS GJSDF ASFLSDF