solving cnflict