diff --git a/README.md b/README.md
index 15727b1..8b65b0d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!---
 # SPDX-FileCopyrightText: 2020 Efabless Corporation
 #
@@ -147,3 +148,6 @@
 
 [0]: openlane/README.md
 [1]: mpw-one-b.md
+=======
+# Caravel_N5_SoC
+>>>>>>> 93dbd5ddbd74afecd9d138df0b323ae5fc93b0d6