Compiler erros fixed
merge conflicts solved