do not highlight columns wider than 80
resolve conflicts