add scaffolding
resolving merge conflicts