initial prestashop
resolve conflict