Added registration links
Fixed merge error