fixed merge conflict typo
fixed merge conflict typo

nmckahd/AHDBurundi,CoolestNerdIII/elmo,nmckahd/AHDBurundi,nmckahd/AHDBurundi,VIP-eDemocracy/elmo,CoolestNerdIII/elmo,thecartercenter/elmo,CoolestNerdIII/elmo,thecartercenter/elmo,VIP-eDemocracy/elmo,thecartercenter/elmo,VIP-eDemocracy/elmo