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