add are you sure?
modify branch 2
add another line in branch2
some new line again
resolve conflict