prepare to merge step 4 and 5