Revert conflicts

Improves handling of conflicted situations in revert operation