Fixed the merge

Everything is all fixed now. It's all together. And it is glorious.
GLORIOUS I SAY!!!