Resolved conflicts between OS and OH.