Resolved more merge conflicts ...