Improved revert operation to add better handling of conflict cases
Merge branch 'volaya/revert_conflicts' into master