fix: resolve merge conflict in deployApp.ts

Author: abbesBenayache

deployment-dapp/src/singleFunction/deployApp.ts

@@ -26,13 +26,8 @@ export const deployApp = async ({
 
   const mrenclave = {
     framework: 'SCONE' as any, // workaround framework not auto capitalized
-<<<<<<< HEAD
-    version: 'v5',
-    entrypoint: 'node --disable-wasm-trap-handler /app/app.js',
-=======
     version: 'v5.9',
-    entrypoint: 'node /app/app.js',
->>>>>>> b07b9b1 (fix: update scone version in dapp deployment)
+    entrypoint: 'node --disable-wasm-trap-handler /app/app.js',
     heapSize: 1073741824,
     fingerprint,
   };