diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 # Phabricator QA Mercurial Test Repository
 
+# different conduit change
+
 ## Using arc
 
 The followings steps will configure arcanist for use in dev, stage, and production environments:
 
 1. Clone the following repositories to the same directory on your machine:
diff --git a/README.md.orig b/README.md.orig
new file mode 100644
--- /dev/null
+++ b/README.md.orig
@@ -0,0 +1,70 @@
+# Phabricator QA Mercurial Test Repository
+
+<<<<<<< working copy
+# conduit change
+# and more
+# plus this
+
+||||||| base
+# conduit change
+# and more
+
+=======
+>>>>>>> destination
+## Using arc
+
+The followings steps will configure arcanist for use in dev, stage, and production environments:
+
+1. Clone the following repositories to the same directory on your machine:
+
+```bash
+$ mkdir ~/phacility; cd ~/phacility
+$ git clone https://github.com/phacility/libphutil
+$ git clone https://github.com/phacility/arcanist
+```
+
+2. Open your ~/.bash_profile file and add the following:
+
+```bash
+alias arc='~/phacility/arcanist/bin/arc'
+```
+
+Doing so will allow you to use the arc command from anywhere on your machine
+
+Don't forget to:
+
+```bash
+$ source ~/.bash_profile
+```
+
+3. Connect to your Phabricator account (follow instructions provided):
+
+```bash
+$ arc install-certificate
+```
+
+4. Make some changes to files in the repository:
+
+```bash
+$ hg clone https://hg.mozilla.org/automation/phabricator-qa-dev
+$ cd phabricator-qa-dev
+$ echo "test file" > foo.txt
+$ hg add foo.txt
+$ hg commit -m 'My new file'
+```
+
+4. Send a diff to Phabricator and create a new revision:
+```bash
+$ arc diff
+```
+
+5. To update a revision, just do the same thing:
+
+$ echo "more change" >> foo.txt
+$ hg add foo.txt
+$ hg commit -m "Updated file"
+$ arc diff
+
+6. When your revision has been accepted, push it normally.
+(arc does not have push integration in Mercurial because it can't force
+ merges and thus can't guarantee it will be able to do anything useful.)