Adding rspec
Resolve merge conflict