Fix merge error and updated gemfile.