registerController edited
fixed merge conflict registerCtrl