made changes
more changes
additional changes
merge

ranch 'new_branch'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
stuff
conflict
merged branches
conflict
conflict
conflict resolve
conflict resolution 2