fix CodeRay conflicts