commit pre-merge
merge de AddressBookManager