Resolved namespace conflict