Final migration merge