gemfile lock, merge conflicts fixed