feature specs user
rspec and db
merge conflict
merge
zipcode fix