merged the two projects client & commande