Fix merge derp with textures