Fixed derp from previous merge

How do I even merge.