Fix duplicate field problem. Tests pass.
Resolve conflicts.
Modify.
Merge branch 'master' into refactor