solve more merge conflicts