Fixed merge mistake
Bumped version