[zim] Styling.
[git] Add an alias, merve, for sane merging.