somethings
fixed the goddamn merge conflicts