some changes added
conflict solved