Fix options deep merge
Merge branch 'refactor-primaryKey-option'