Squashes all of the commits into one. Hopefully. If I fucked this up, welp
Merge

i never want to fix a single conflict ever again