fixed type conflicts