Clean dependencies
fixed conflict