Removed some more merge conflicts