compare
compare page
new changes
conflict resolved