Auto-merging src/applications/diffusion/controller/DiffusionRepositoryTestAutomationController.php
CONFLICT (add/add): Merge conflict in src/applications/diffusion/controller/DiffusionRepositoryTestAutomationController.php
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.