change text width to 80
add diff and merge tool