fix: merge conflict

Author: Andrea Falzetti

components/supervisor/pkg/supervisor/supervisor.go

@@ -296,11 +296,7 @@ func Run(options ...RunOption) {
 	} else {
 		topService.Observe(ctx)
 
-<<<<<<< HEAD
 		if !cfg.isHeadless() && !opts.RunGP {
-=======
-		if !cfg.isHeadless() {
->>>>>>> 8432f8b2f ([supervisor] make it compatible with run-gp)
 			go startAnalyze(ctx, cfg, gitpodConfigService, topService, gitpodService)
 		}
 		if !strings.Contains("ephemeral", cfg.WorkspaceClusterHost) {