Remove merge-tool section, add alias for graft
Comment out syntax-highlighting styles section