Bird Marella team resolves dispute in "NCIS: Los Angeles" entertainment matter