Prepare merge
Merge