add join table for rooms users
fix conflicts; push new migrations