dpad and parallax
merge conflicts
merging again