Changes after conflict in NasaReg Controller file