BS-8634, fix migration merge conflict