began prepping for merge