more merge conflicts testing