Resolved conflict on autocomplete_contacts

...rch_entreprise/Views/action-administration.component.html

...ch_entreprise/Views/actions-administration.component.html

apps/maarch_entreprise/Views/administration.component.html

...rch_entreprise/Views/basket-administration.component.html

...ch_entreprise/Views/baskets-administration.component.html

...arch_entreprise/Views/group-administration.component.html

...rch_entreprise/Views/groups-administration.component.html

...ch_entreprise/Views/history-administration.component.html

...treprise/Views/historyBatch-administration.component.html

...treprise/Views/notification-administration.component.html

...reprise/Views/notifications-administration.component.html

..._entreprise/Views/parameter-administration.component.html

...entreprise/Views/parameters-administration.component.html

...entreprise/Views/priorities-administration.component.html

...h_entreprise/Views/priority-administration.component.html

...ch_entreprise/Views/reports-administration.component.html

...rch_entreprise/Views/status-administration.component.html

...h_entreprise/Views/statuses-administration.component.html

...reprise/Views/update-status-administration.component.html

...aarch_entreprise/Views/user-administration.component.html