lzpap · lzpap · Nov 27, 2019 · Nov 26, 2019 · Nov 26, 2019 · Nov 26, 2019
diff --git a/client-libraries/0.1/how-to-guides/python/check-balance.md b/client-libraries/0.1/how-to-guides/python/check-balance.md
@@ -67,4 +67,4 @@ Click the green button to run the sample code in this guide and see the results
 
 [Listen for live transactions on the Tangle](../python/listen-for-transactions.md).
 
-You can also check the balance of an address, using a utility such as the [Tangle explorer](https://utils.iota.org).
+You can also check the balance of an address, using a utility such as the [Tangle explorer](https://utils.iota.org).
diff --git a/client-libraries/0.1/how-to-guides/python/transfer-iota-tokens.md b/client-libraries/0.1/how-to-guides/python/transfer-iota-tokens.md
@@ -135,4 +135,4 @@ For example, you are online shopping and the checkout has a QR code that gives y
 
 During the time it takes you to complete the checkout and send your transfer bundle, the website owner withdraws IOTA tokens from the address in the QR code. Now that address is spent, and you have just sent IOTA tokens to it.
 
-To help stop this from happening, we recommend using the [account module](../../account-module/introduction/overview.md) to create conditional deposit addresses that specify whether they are active or expired.
+To help stop this from happening, we recommend using the [account module](../../account-module/introduction/overview.md) to create conditional deposit addresses that specify whether they are active or expired.
diff --git a/client-libraries/home.md b/client-libraries/home.md
@@ -6,19 +6,11 @@
 [Go quickstart](/0.1/getting-started/go-quickstart.md)
 ## Get started with the Go client library
 
-<<<<<<< HEAD
 [Java quickstart](/0.1/getting-started/java-quickstart.md)
 ## Get started with the Java client library
 
 [JavaScript quickstart](/0.1/getting-started/js-quickstart.md)
 ## Get started with the JavaScript client library
-<<<<<<< HEAD
 
 [Python quickstart](/0.1/getting-started/python-quickstart.md)
 ## Get started with the Python client library
-=======
-=======
-[Libraries](/0.1/introduction/overview.md)
-## Learn about the official client libraries for [JavaScript](root://iota-js/0.1/introduction/overview.md), [GoLang](root://iota-go/0.1/introduction/overview.md), [Java](root://iota-java/0.1/introduction/overview.md) and [Python](root://iota-python/0.1/introduction/overview.md)
->>>>>>> Add Python lib documentation
->>>>>>> c0bb5e5717a8be3ec40dc99bcd62d07d38faa603
Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,4 +67,4 @@ Click the green button to run the sample code in this guide and see the results

		[Listen for live transactions on the Tangle](../python/listen-for-transactions.md).

		You can also check the balance of an address, using a utility such as the [Tangle explorer](https://utils.iota.org).
		You can also check the balance of an address, using a utility such as the [Tangle explorer](https://utils.iota.org).
Original file line number	Diff line number	Diff line change
Expand Up		@@ -135,4 +135,4 @@ For example, you are online shopping and the checkout has a QR code that gives y

		During the time it takes you to complete the checkout and send your transfer bundle, the website owner withdraws IOTA tokens from the address in the QR code. Now that address is spent, and you have just sent IOTA tokens to it.

		To help stop this from happening, we recommend using the [account module](../../account-module/introduction/overview.md) to create conditional deposit addresses that specify whether they are active or expired.
		To help stop this from happening, we recommend using the [account module](../../account-module/introduction/overview.md) to create conditional deposit addresses that specify whether they are active or expired.