fixed merge conflicts
merge conflicts fixed from migration