diff --git a/cli/app/logs.go b/cli/app/logs.go
index a95d08f1..771cd582 100644
--- a/cli/app/logs.go
+++ b/cli/app/logs.go
@@ -70,12 +70,7 @@ var appLogsCommand = &cli.Command{
 
 		serviceName := c.Args().Get(1)
 		if serviceName == "" {
-<<<<<<< HEAD
-			logrus.Debug("tailing logs for all app services")
-			stackLogs(app.StackName(), cl)
-=======
 			stackLogs(c, app.StackName(), cl)
->>>>>>> bcaf285 (refactor: use cli context vs creating new one)
 		}
 		logrus.Debugf("tailing logs for '%s'", serviceName)