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