Fix dirty missed merge conflict
Fix config, fix migration file name