Resolving revert conflicts.