Replace many to many associaitons
Fix conflict