separated and enhanced quick facts style
Merge conflict resolution