Enable the autoIncrement even if you have set the primarykey of two or more
Fix merge conflict
Merge branch 'kkurahar-enable-autoIncrement'