rename factories and add associations in brainstorm and ideas
fix conflict