fixed merge conflict
fix merge Gemfile.lock
updated specs to reflect new actions