product responsive
resolved conflicts