Adding fix for conflicting with colordiff in community