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