Prepping for merges