Fixed more merge errors