Resolve conflicts
Change namespace
Namespace fix