Added registration feature
Fixed merge conflict