Taylor Swift's Trademark Dispute Resolved with Controversial Bedding Firm