add merge.tool alias for git
update theme