fix migration merge