chg: [appModel] Fixed merge conflict
chg: [appModel] Fixed merge conflict

MISP/MISP,SteveClement/MISP,SteveClement/MISP,SteveClement/MISP,SteveClement/MISP,MISP/MISP,SteveClement/MISP,MISP/MISP,MISP/MISP,MISP/MISP