resolved conflit

Author: joaojmendes

package.json

@@ -81,7 +81,7 @@
     "@types/react": "17.0.45",
     "@types/react-addons-shallow-compare": "0.14.17",
     "@types/react-addons-test-utils": "0.14.15",
-    "@types/react-addons-update": "0.14.14",
+    "@types/react-addons-update": "0.14.21",
     "@types/react-dom": "17.0.17",
     "@types/react-mentions": "^4.1.3",
     "@types/sinon": "2.3.4",