Resolve merge conflict in CastManager