Updated SuperLU
Fixed merge