prepping for merge