bah mfixing shitty merge