added change1
made a change2
Merge branch 'change2' into change1
conflict resolved