Prepare to merge back