Fixed merge conflicts

CHANGELOG.md

@@ -21,6 +21,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 
+## [3.3.2] - 2022-10-18
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1576](https://github.com/shlinkio/shlink/issues/1576) Fixed error when trying to retry visits location from CLI.
+
+
 ## [3.3.1] - 2022-09-30
 ### Added
 * *Nothing*

composer.json

@@ -20,7 +20,7 @@
         "akrabat/ip-address-middleware": "^2.1",
         "cakephp/chronos": "^2.3",
         "doctrine/migrations": "^3.5",
-        "doctrine/orm": "^2.13",
+        "doctrine/orm": "^2.13.3",
         "endroid/qr-code": "^4.6",
         "geoip2/geoip2": "^2.13",
         "guzzlehttp/guzzle": "^7.5",