Preparing for merge