Removed Gemfile conflicts, again