getting rid of weird stuff again

i guess it's being caused by me conflicting with my own commits wtf lol