diff --git a/app/.gitignore b/app/.gitignore
index e86fe25..e675663 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -67,3 +67,6 @@ yarn-error.log
 .pnp.js
 # Yarn Integrity file
 .yarn-integrity
+
+# ignore package-lock as it complicates merging
+package-lock.json
\ No newline at end of file