changes made
conflict removed
modified source code