resolving revert conflict