updating merge conflict.
Merge branch 'charColor' into develop