trying to fix merge conflicts

moving files around n stuff,
erasing and replacing,
that kinda thing