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