merge new registration code