fixed a merge issue and bumped version number