textures
fixed merge conflicts