develop merge & bumping version