fixes migration problem and review problem
merge conflict