Fix missed conflict in merge of branch 'colours'