fixed some shit
merge conflict