[REM]Remove product conflicts after merege