Resolve migration file conflict as a result of merging latest changes from
master