Even more merge conflicts fixed