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