Fixed merge bug in ConvertSHPToGLI (moved break statement).