Regenerated Gemfile.lock
Resolve conflict with gemfile
Remove redundancies from Gemfile