corrected merge for TextureAtlas