Kim Kardashian Says Beef with Taylor Swift is Over