Some more merge erros fixed