fix non existant merge conflict
Cool double parallax and the texture tweaks to make it happen
rendering