I dont think I changed anything why am I committing stuff
Fixed merge