some changes made
new changes
conflict removed