liblinear is now a submodule
fixed conflicts