new error that i cant fix YAY
did i just merge?