Fix/mailmap again

final fixes for 0.86 release :)
I'm seeing the problem in git diff however actual file seems to be fine