add consistency in conflict test