From bd7c6467113614c7beca90ede700115d9a43fa21 Mon Sep 17 00:00:00 2001
From: Barrie Byron <barrie@o1labs.org>
Date: Mon, 14 Aug 2023 14:41:12 -0400
Subject: [PATCH] resolve conflicts from stash

---
 .../tutorials/04-zkapp-ui-with-react.mdx      | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/docs/zkapps/tutorials/04-zkapp-ui-with-react.mdx b/docs/zkapps/tutorials/04-zkapp-ui-with-react.mdx
index a48424771..ae38eb0a3 100644
--- a/docs/zkapps/tutorials/04-zkapp-ui-with-react.mdx
+++ b/docs/zkapps/tutorials/04-zkapp-ui-with-react.mdx
@@ -87,20 +87,18 @@ The `zk project` command can scaffold the UI for your project.
 
   The `zk project` command has the ability to scaffold the UI for your project. For this tutorial, select `next`:
 
-<<<<<<< Updated upstream
   ```
-  ? Create an accompanying UI project too? …
-❯ next
-  svelte
-  nuxt
-  empty
-  none
+    ? Create an accompanying UI project too? …
+  ❯ next
+    svelte
+    nuxt
+    empty
+    none
   ```
-=======
+
 1. If you are prompted to install the required Next packages, press **y** to proceed. 
->>>>>>> Stashed changes
 
-1. Select **yes** at the `? Do you want to setup your project for deployment to Github Pages? …` prompt.
+1. Select **yes** at the `? Do you want to set up your project for deployment to Github Pages? …` prompt.
 
 1. If you are prompted to install the required Next packages, press **y** to proceed. 
 
@@ -110,7 +108,6 @@ The `zk project` command can scaffold the UI for your project.
 
 1. Select **No** at the `? Would you like to use Tailwind CSS with this project?` prompt.
 
-<<<<<<< Updated upstream
   Your UI is created in the project directory: `/04-zkapp-browser-ui/ui` with two directories:
 
   - `contracts`: The smart contract code 
@@ -153,7 +150,7 @@ For all projects, you run `zk` commands from the root of your `04-zkapp-browser-
 For this tutorial, run the UI commands from the local `/04-zkapp-browser-ui/ui/` directory.
 
 Files that contain the UI code are in the `ui/src/pages` directory. 
-=======
+
 The expected output is:
 
 ```text
@@ -170,7 +167,6 @@ Initializing project with template: default
 ```
 
 For this tutorial, you run commands from the root of the `04-zkapp-browser-ui` directory as you work in the `ui/src/pages` directory on files that contain the UI code. 
->>>>>>> Stashed changes
 
 Each time you make updates, then build or deploy, the TypeScript code is compiled into JavaScript in the `build` directory.