Add scaffoldings
Merge
Fix relationships
Fix conflicts