getting ready to merge