ManyToMany handles primary_key option
Update changelog
Fix conflict
Fix failing tests