Revert a conflict