[Registration] Fixed merge errors