From 1c609b2aaa471c0edcde71c7bfe42b865a77650e Mon Sep 17 00:00:00 2001
From: odscjen <jen.harris@opendataservices.coop>
Date: Mon, 26 Jun 2023 14:34:29 +0100
Subject: [PATCH] merge with dev for docs update

---
 docs/data_model/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/data_model/index.md b/docs/data_model/index.md
index 4ea8dead..3e420243 100644
--- a/docs/data_model/index.md
+++ b/docs/data_model/index.md
@@ -2,7 +2,8 @@
 
 The Risk Data Library Standard schema covers [general dataset attributes](general) and four specific components:
 
-<<<<<<< HEAD
+\<\<\<\<\<\<\< HEAD
+
 - [**Hazard**](hazard.md): main hazard type, specific process, trigger of the hazard, occurrence frequency of event, intensity unit to measure the process and analytical method.
 - [**Exposure**](exposure.md): asset category, occupancy and specific taxonomy, cost type and value.
 - [**Vulnerability**](vulnerability.md): model that links hazard intensity and exposure classification to measure of impact over the total exposed value.