Added auto-increment conflict resolver
Added throw exception conflict resolver