Prepare merge
After merge