conflit jbCarte
resolution conflit