Justin Bieber, Marilyn Manson End T-shirt Feud