updated risk-mapping conflict