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