changes made
conflict removed
changes