OD UNTESTED: Implement Data store commit clash