Cleaned up Gemfile after conflicts