diff --git a/hp-docs/README.md b/hp-docs/README.md
index f701d7e..9c877f6 100644
--- a/hp-docs/README.md
+++ b/hp-docs/README.md
@@ -41,7 +41,7 @@ Helper modules can be used together with the building blocks to create cutting-e
- These tools are extensively employed in the day-to-day development and operation of applications built on Holepunch, like [Keet.io](https://keet.io/).
+ ✔️These tools are extensively employed in the day-to-day development and operation of applications built on Holepunch, like [Keet.io](https://keet.io/).
## Applications built using Holepunch
@@ -84,13 +84,7 @@ Hypercores are single-writer data structures, but collaboration is crucial. [aut
As Autobase's output shares the familiar Hypercore API, it is possible to plug it into higher-level modules like Hyperbee and Hyperdrive, getting a multi-user collaboration with little additional effort.
-<<<<<<< HEAD
-{% hint style="warning" %}
-Autobase is still experimental and is likely to change significantly in the near future. Give it a shot!
-{% endhint %}
-=======
- Autobase is still experimental and is likely to change significantly in the near future. If you're feeling adventurous, give it a shot!
->>>>>>> ea20f22852e518505a9bc5035bfc5ee1c67373ee
+ ⚠️ Autobase is still experimental and is likely to change significantly in the near future. If you're feeling adventurous, give it a shot!
## Stability indexing
@@ -118,4 +112,4 @@ The following stability indices have been used:
| [hyperdht.md](building-blocks/hyperdht.md "mention") | **stable** |
- Any part of a module (method, event, or property) that is not documented as part of that module's public API is subject to change at any time.
+ ⚠️ Any part of a module (method, event, or property) that is not documented as part of that module's public API is subject to change at any time.