----
-Here's a paragraph. This is a confict test; I'm also editing this line on
-the web.
+Here's a paragraph. This is a conflict test edit.......
Here's another one with *emphasised* text.
* item
* just to try this stuff - looks kool!
* test
-* hi mom!
[[WikiLink]]