allow some fields as duplicated fields
Merge branch 'smash' of github.com:xwangsd/Scuba into smash