diff --git a/serviciosacademicos/consulta/interfacesinfusion/php5.3/composer.json b/serviciosacademicos/consulta/interfacesinfusion/php5.3/composer.json
index 5ee87e729..56ace7445 100644
--- a/serviciosacademicos/consulta/interfacesinfusion/php5.3/composer.json
+++ b/serviciosacademicos/consulta/interfacesinfusion/php5.3/composer.json
@@ -30,7 +30,11 @@
         "mockery/mockery": "dev-master",
         "phpunit/phpunit": "~4",
         "squizlabs/php_codesniffer": "2.*",
+<<<<<<< HEAD
+        "codeception/aspect-mock": "4.1.1"
+=======
         "codeception/aspect-mock": "0.5.5"
+>>>>>>> main
     },
     "autoload": {
         "psr-0": {