code commented
conflict solved