edited example
changed merge
newbranch