diff --git a/resolve-typechain-conflicts.sh b/resolve-typechain-conflicts.sh
new file mode 100644
index 000000000..19e34a716
--- /dev/null
+++ b/resolve-typechain-conflicts.sh
@@ -0,0 +1,8 @@
+rm -rf typescript/src/typechain
+cd solidity/optics-core 
+hardhat compile
+cd ../optics-xapps
+hardhat compile
+cd ../..
+git add typescript/src/typechain
+git rebase --continue
\ No newline at end of file