merge check
 branch 1 change
merged
 making a chage
 merge conflict resolved