add composer.lock and SocieteCustomerBundle
add
add
edit conflict