merged
mentioned in commit b2450841
This will create a new commit in order to revert the existing changes.
