added spacing after tertiary name list so conflicts badge has more room, hide...
added spacing after tertiary name list so conflicts badge has more room, hide conflict badge/name if the user is conflicted
added spacing after tertiary name list so conflicts badge has more room, hide conflict badge/name if the user is conflicted