Choice view indicates current selection. Fixed all Xcode warnings.
Merge conflict resolution