Change the way PKs for through table are handled
Use composite unique keys for has-many with through model
Another merge..