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