added --no-color to the diff command
Merge notmyname into master (fix conflict)