diff --git a/README.md b/README.md
index 15727b1..fa8de0f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!---
 # SPDX-FileCopyrightText: 2020 Efabless Corporation
 #
@@ -15,6 +16,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 -->
+=======
+# Test Circuits for Stochastic Computation
+This project contains test circuits for stochastic computation, namely the synthesizable comparators for a stochastic ADC, to be submitted for Google SKY130 open MPW shuttle on the Caravel SoC.
+
+>>>>>>> Update README.md
 # CIIC Harness  
 
 A template SoC for Google SKY130 free shuttles. It is still WIP. The current SoC architecture is given below.