Bumped version
fixing conflict