fixing merge conflict on mkdocs.yml

docs/maintainers/handbook.md

@@ -27,7 +27,7 @@ This is a [compose specification](https://compose-spec.io/) compliant file that
 
 ### `.env.sample`
 
-This file is a skeleton for environmental variables that should be adjusted by the user. Examples include: domain or php extention list. Whenever you create a new app with `abra app new` this file gets copied to the `~/.abra/servers/<server-domain>/<app-domain>.env` and when you run `abra app config <app-domain>` you're editing this file.
+This file is a skeleton for environmental variables that should be adjusted by the user. Examples include: domain or PHP extension list. Whenever you create a new app with `abra app new` this file gets copied to the `~/.abra/servers/<server-domain>/<app-domain>.env` and when you run `abra app config <app-domain>` you're editing this file.
 
 ### `abra.sh`
 

docs/maintainers/tutorial.md

@@ -16,10 +16,10 @@ Depending on your familiarity with recipes, it might be worth reading [how a rec
 
 The ideal scenario is when the upstream project provides both the packaged image and a compose configuration which we can build from. If you're in luck, you'll typically find a `Dockerfile` and a `docker-compose.yml` file in the root of the upstream Git repository for the app.
 
-- **Tired**: Write your own image and compose file from scratch
-- **Wired**: Use someone else's image (& maybe compose file)
-- **Inspired**: Upstream image, someone else's compose file
-- **On fire**: Upstream image, upstream compose file
+- **Tired**: Write your own image and compose file from scratch :sleeping:
+- **Wired**: Use someone else's image (& maybe compose file) :smirk_cat:
+- **Inspired**: Upstream image, someone else's compose file :exploding_head:
+- **On fire**: Upstream image, upstream compose file :fire:
 
 ### Writing / adapting the `compose.yml`