merge and bump