This piece highlights the need to understand the operational context of humanitarian work, so that humanitarian action will be "conflict-sensitive." By analysing the conflict in different aspects, humanitarian response will be more effective and improve its linkage with peacebuilding and development. It presents the work of the United Nations Office for the Coordination of Humanitarian Affairs (OCHA) to this end. It also serves as a primer on key terms and concepts in the academic study of conflict preparedness and response and risk management.