Fix merge issue in CHANGELOG.md
Fix merge issue in CHANGELOG.md


OpenZeppelin/zeppelin-solidity,OpenZeppelin/zeppelin-solidity,OpenZeppelin/openzeppelin-contracts,OpenZeppelin/openzeppelin-contracts,OpenZeppelin/openzeppelin-contracts