updates per PR review

docs/development.md

@@ -262,7 +262,6 @@ PF_SERVER_LOG_DIRECTORY=/data/GameLogs/
 PF_TITLE_ID=1E03
 _=/usr/bin/env
 ```
-<<<<<<< HEAD
 
 ## Docker compose
 
@@ -278,6 +277,4 @@ To test your changes to thundernetes to a Kubernetes cluster, you can use the fo
 - Run `create-install-files-dev` to create the install files for the cluster
 - Checkout the `installfilesdev` folder for the generated install files. This file is included in .gitignore so it will never be committed.
 - Test your changes as required.
-
-=======
->>>>>>> use sync.map
+

nodeagent/nodeagentmanager.go

@@ -209,7 +209,7 @@ func (n *NodeAgentManager) heartbeatHandler(w http.ResponseWriter, r *http.Reque
 	currentState := gsd.CurrentGameState
 	gsd.Mutex.RUnlock()
 
-	if currentState == GameStateInvalid { // user has not set the status yet
+	if currentState == GameStateInvalid { // status has not been set yet
 		op = GameOperationContinue
 	} else if currentState == GameStateInitializing {
 		op = GameOperationContinue
@@ -232,7 +232,12 @@ func (n *NodeAgentManager) heartbeatHandler(w http.ResponseWriter, r *http.Reque
 		SessionConfig: *sc,
 	}
 
-	json, _ := json.Marshal(hr)
+	json, err := json.Marshal(hr)
+
+	if err != nil {
+		internalServerError(w, err, "error marshalling heartbeat response")
+		return
+	}
 
 	w.WriteHeader(http.StatusOK)
 	w.Write(json)

operator/config/manager/kustomization.yaml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 resources:
 - manager.yaml
 generatorOptions:
@@ -13,19 +12,3 @@ images:
 - name: controller
   newName: ghcr.io/playfab/thundernetes-operator
   newTag: 738a3b4
-=======
-resources:
-- manager.yaml
-generatorOptions:
-  disableNameSuffixHash: true
-configMapGenerator:
-- files:
-  - controller_manager_config.yaml
-  name: manager-config
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: thundernetes-operator
-  newTag: 257812c
->>>>>>> use sync.map