Sorted Conflicts from Login Feature Merge