Adding scaffolding
Fix conflict