finish 2 proposer conflict live test
add consistency in conflict test
Merge pull request #59 from fengjingchao/dev

finish 2 proposer conflict live test