Security Registration Code

Resolved some conflicts