installed rspec
created database
resolved merge conflicts