fix: [merge conflict] resolved,
fix: [merge conflict] resolved,

- as notified by @a1ext

FIRSTdotorg/MISP,MISP/MISP,FIRSTdotorg/MISP,FloatingGhost/MISP,FIRSTdotorg/MISP,MISP/MISP,MISP/MISP,FIRSTdotorg/MISP,Rafiot/MISP,Rafiot/MISP,SteveClement/MISP,SteveClement/MISP,SteveClement/MISP,SteveClement/MISP,MISP/MISP,SteveClement/MISP,FloatingGhost/MISP,Rafiot/MISP,FloatingGhost/MISP,FloatingGhost/MISP,MISP/MISP,Rafiot/MISP