fixed error in migration where local variable was not passed to extracted method
code styling
fixed merge conflict