support for authorname and authoremail when merging non-conflicting branches