1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 42e01645e..5d3b9a5cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ Yosys 0.8 .. Yosys 0.8-dev
     - Added "equiv_opt" pass
 
 
+>>>>>>> upstream/master
 Yosys 0.7 .. Yosys 0.8
 ----------------------