resolve merge

app/src/main/java/com/example/jnicpp/bowling/BowlingCameraActivity.kt

@@ -66,7 +66,8 @@ class BowlingCameraActivity : AppCompatActivity(), CameraXController.Callback {
     // class for FeedbackUI
     private lateinit var feedbackUI: FeedbackUI
     private val stepLabels = listOf(
-        R.string.starting_position,
+        R.string.pose_phase_waiting,
+        R.string.pose_phase_starting_stance,
         R.string.first_step,
         R.string.second_step,
         R.string.third_step,
@@ -261,7 +262,7 @@ class BowlingCameraActivity : AppCompatActivity(), CameraXController.Callback {
                 binding.btnRecord.isEnabled = false
                 binding.switchPose.isEnabled = false
                 binding.btnShowStep.isEnabled = true
-                binding.btnShowStep.setText(R.string.starting_position)
+                binding.btnShowStep.setText(R.string.pose_phase_waiting)
             }
             is CameraViewModel.RecordingState.Recording -> {
                 binding.btnRecord.isEnabled = true