prepping to merge