initial merge