merged conflicting topic migrations