Fixed this shit.

I hope to never deal with commit hell every fucking again.