Fix ome merge issues.