resolved merge conflict
forgot to git rm some files
renamed snow shaders