Prevent normal flips and handle feature edges better
This will create a new commit in order to revert the existing changes.
