change colour complete
merge