bumped version
fixed conflict