adding some textures, resolve merge conflict