using better resolution textures
fixed merge conflicts