Renaming 'atomic' kwarg to 'raise_on_conflict' for clarity