git(conflict): fix last conflict in composer.lock
git(conflict): fix last conflict in composer.lock

centreon/centreon,centreon/centreon,centreon/centreon,centreon/centreon,centreon/centreon,centreon/centreon,centreon/centreon