trying to fix merge issues and update parallax stuff