frm p1
conflict solvd