Found one merge conflict marker `<<<<<<< HEAD` in [CHANGELOG.md](https://github.com/open-telemetry/opentelemetry-python/blob/metrics_new/CHANGELOG.md) from 589ba998fddce2cff6d039d0938637a0e058d041 Possibly could be more