Fix merge conflicts and YAML metadata

README.md

@@ -1,20 +1,15 @@
 ---
-title: ShadowBox
+title: Attachment Style Roleplay Simulator
 emoji: 🎭
 colorFrom: purple
 colorTo: pink
 sdk: streamlit
 sdk_version: 1.45.0
-<<<<<<< HEAD
 app_file: src/streamlit_app.py
-=======
-app_file: app.py
->>>>>>> b276373ea99595bd32f716d9d326ef0762cf2bf2
 pinned: false
 short_description: "ShadowBox: Calm, anonymous AI companion for youth distress."
 ---
 
-<<<<<<< HEAD
 # Attachment Style Roleplay Simulator
 
 A therapeutic roleplay simulator built for practicing emotionally charged conversations, created by Jocelyn Skillman LMHC.
@@ -40,11 +35,6 @@ This tool helps users rehearse boundary-setting and difficult conversations by s
    ANTHROPIC_KEY=your_api_key_here
    ```
 4. Run the app: `streamlit run src/app.py`
-=======
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
-
-This Streamlit app provides an anonymous chat interface powered by OpenAI's gpt-4o model, designed as a 'digital companion' called ShadowBox.
->>>>>>> b276373ea99595bd32f716d9d326ef0762cf2bf2
 
 ## Learn More