fixing products conflict