Improve formatting of commit message for merged/conflicting branches