source data fixes
force colour override entire object
merge conflicts