MAINT: solve merge conflict
MAINT: solve merge conflict

mne-tools/mne-cpp,chdinh/mne-cpp,mne-tools/mne-cpp,LorenzE/mne-cpp,chdinh/mne-cpp,mne-tools/mne-cpp,chdinh/mne-cpp,chdinh/mne-cpp,LorenzE/mne-cpp,chdinh/mne-cpp,mne-tools/mne-cpp,LorenzE/mne-cpp,LorenzE/mne-cpp,mne-tools/mne-cpp,chdinh/mne-cpp,mne-tools/mne-cpp