new product idea
fixed conflict