Fixed package

Author: enicolasgomez

webapp/package.json

@@ -20,15 +20,9 @@
     "@material-ui/core": "4.12.1",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.60",
-<<<<<<< HEAD
-    "@metacell/geppetto-meta-client": "v1.0.0-rc11",
-    "@metacell/geppetto-meta-core": "v1.0.0-rc11",
-    "@metacell/geppetto-meta-ui": "v1.0.0-rc11",
-=======
     "@metacell/geppetto-meta-client": "1.0.0-final",
     "@metacell/geppetto-meta-core": "1.0.0-final",
     "@metacell/geppetto-meta-ui": "1.0.0-final",
->>>>>>> origin/development
     "@nosferatu500/react-sortable-tree": "3.0.5",
     "@sentry/integrations": "^6.16.1",
     "@sentry/react": "^6.16.1",