updated register template
fixed merge conflict