fixed migration inconsistency
merge