fix ChangeLog conflict.