Travis Scott Settles Nightclub Dispute with Victim, Criminal Charges Still Loom