Revert conflict?