prepping merge