Fixed wierd broken merge

I hope this merge hell just goes away.