update merge help images

- make conflicts labels smaller
- add branch names (current, other)
- show merge commit above current branch commits instead of other to better illustrate that the other branch is merged into the current