merge migration branches