Add a note in the change log about the changed default for `merge` on `reset`