cleanup: remove typo and git merge info from documentation (#188)

* cleanup: remove git merge info from dchat README

* doc: fix spelling mistake

---------

Co-authored-by: y <y>

doc/src/development/development.md

@@ -80,7 +80,7 @@ This allows us to coordinate more effectively.
 
 \* once we have proper syncing implemented in ircd, these will become less relevant and not needed.
 
-Another option is to run your ircd inside a persistant tmux session, and never miss messages.
+Another option is to run your ircd inside a persistent tmux session, and never miss messages.
 
 ## Code coverage
 

example/dchat/README.md

@@ -36,12 +36,7 @@ Now run `lilith`:
 ## Step 2: Using dchat
 
 ```shell
-<<<<<<< HEAD
-cd example/dchat
-cargo run
-=======
 make BINS="dchat"
->>>>>>> ac3d1d7d271 (dchat: update README with lilith usage)
 ```
 
 Run dchat as an inbound node: