merge, bump version