project structure
rspec
Conflict fixed