Fixed namespaces + fixed merge conflicst
fixed some typos