Resolving conflict in colorize patch #7742

This commit is contained in:
Robby Russell
2019-12-20 22:43:20 -08:00