fix merge

Author: raphaeltm

starter-sample/compose.yaml

@@ -16,8 +16,4 @@ services:
     healthcheck:
       # wget or curl required for healthchecks on services with a published port
       # this gets parsed by Defang and provided to the load balancers as well
-<<<<<<< HEAD
-      test: ["CMD", "curl", "-f", "http://localhost:3000/api/health" ]
-=======
       test: ["CMD", "curl", "-f", "http://localhost:3000/"]
->>>>>>> main