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