Star of Paramount show returns after resolving conflict with showrunner