fixed merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/client/views/collections/CollectionStackedTimeline.tsx b/src/client/views/collections/CollectionStackedTimeline.tsx
index 9a8b2940f..25f2e0b25 100644
--- a/src/client/views/collections/CollectionStackedTimeline.tsx
+++ b/src/client/views/collections/CollectionStackedTimeline.tsx
@@ -661,7 +661,7 @@ export class CollectionStackedTimeline extends CollectionSubView<
                                     height={height}
                                     toTimeline={this.toTimeline}
                                     layoutDoc={this.layoutDoc}
-                                    isDocumentActive={this.props.childDocumentsActive ? this.props.isDocumentActive : this.isContentActive}
+                                    // isDocumentActive={this.props.childDocumentsActive ? this.props.isDocumentActive : this.isContentActive}
                                     currentTimecode={this.currentTimecode}
                                     _timeline={this._timeline}
                                     stackedTimeline={this}