cleanup of gemfile and corrected previous merge conflict