bump version with merge