fix merge conflict
fix merge conflict

Phrozyn/MozDef,mpurzynski/MozDef,jeffbryner/MozDef,Phrozyn/MozDef,Phrozyn/MozDef,gdestuynder/MozDef,mozilla/MozDef,gdestuynder/MozDef,jeffbryner/MozDef,mpurzynski/MozDef,mpurzynski/MozDef,mozilla/MozDef,mpurzynski/MozDef,jeffbryner/MozDef,jeffbryner/MozDef,mozilla/MozDef,mozilla/MozDef,gdestuynder/MozDef,Phrozyn/MozDef,gdestuynder/MozDef