Some fixes to make it corresponding to the specification
Update
conflict resolution