Added missing crop textures and fixed crop rendering
fixed a wierd merge error