Removed Gemfile conflicts