added conflict 1
added conflict 2
Merge branch 'conflict1' into develop
merged conflicting changes