show line numbers and always color in grep; show raw control chars with less
fix merge conflict