file movement
merge conflicts fixes