updating package
fixed conflict