fixed next button after merge