unbump version for upstream merge