Merge pull request #14030 from saurabh6790/field_fixes

remove duplicate fields occurred due to merge conflicts