Disney and deadmau5 have resolved their trademark dispute http://ow.ly/OWBgx