Fix old fail with option belongs_to
Fix merge bug in seed data