Merge remote-tracking branch 'old-github/main' into integrate-old-refactors-of-github

management-dashboard-web-app/src/components/PhaseForm.tsx

@@ -147,7 +147,11 @@ export function PhaseForm({ onSubmit, onCancel, loading = false }: PhaseFormProp
                     onChange={(e) => handleInputChange('description', e.target.value)}
                     rows={3}
                     className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
+<<<<<<< HEAD
                     placeholder="Optional description of this experiment phase"
+=======
+                    placeholder="Optional description of this experiment book"
+>>>>>>> old-github/main
                     disabled={loading}
                 />
             </div>