fixed merge conflic on gemfile.lock