removed gemfile lock file
tried changing environment.rb
tried changing environment.rb
changed syntax errors in style
fixed conflict