conflict fix recommend