Taylor Swift Ends Feud with Kim Kardashian in New Song