camera and player move together
merge conflicts fix