diff --git a/README.md b/README.md
index fa8de0f..cbe6e69 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!---
 # SPDX-FileCopyrightText: 2020 Efabless Corporation
 #
@@ -20,7 +19,19 @@
 # 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
+Build instructions (assuming Openlane, PDK, set up properly):
+0. From main caravel directory:
+make uncompress
+
+1. From openlane directory: 
+make top_astria
+make user_project_wrapper
+
+2. From main caravel directory:
+make ship
+(Optional if pushing repo):
+make compress 
+
 # CIIC Harness  
 
 A template SoC for Google SKY130 free shuttles. It is still WIP. The current SoC architecture is given below.