Fixed more merge conflicts