fixed the merge i broke
fixed badstufufufu