solving more merge conflicts