page promo ok + tests descriptifs thes
resolution conflicts