Holy shit merge messed up and that's where alll these problems come from