First Stage of URL Authentication
Resolve Merge Conflicts