Preparing for rewrite merge