Add test for conflict handling in transactions