Fix merge colours