Removes the >>>>> master from the CHANGELOG that was accidentally left after a merge conflict.
>>>>> master
n/a