some shit i don't know
fixed merge conflicts