Resolved type conflict warnings