resolved more merge conflicts