diff --git a/internal/cmd/drive.go b/internal/cmd/drive.go
index 9616eaf..384174a 100644
--- a/internal/cmd/drive.go
+++ b/internal/cmd/drive.go
@@ -106,8 +106,8 @@ func (c *DriveLsCmd) Run(ctx context.Context, flags *RootFlags) error {
 
 	q := buildDriveListQuery(folderID, c.Query)
 
+	// Include files from shared drives, not just personal "My Drive"
 	call := svc.Files.List().
-		// Include files from shared drives, not just personal "My Drive"
 		Q(q).
 		PageSize(c.Max).
 		PageToken(c.Page).
diff --git a/internal/cmd/time_range_more_test.go b/internal/cmd/time_range_more_test.go
index 7634e0a..5552309 100644
--- a/internal/cmd/time_range_more_test.go
+++ b/internal/cmd/time_range_more_test.go
@@ -161,8 +161,6 @@ func TestGetUserTimezoneInvalid(t *testing.T) {
 		t.Fatalf("expected error")
 	}
 }
-<<<<<<< HEAD
-
 func TestResolveTimeRangeWithDefaultsToTomorrowEndOfDay(t *testing.T) {
 	svc := newCalendarServiceWithTimezone(t, "UTC")
 	flags := TimeRangeFlags{