Fixing more merge conflicts