Products index.ctp changed
confilict fixed