diff --git a/api.md b/api.md
index 1385f13..0362153 100644
--- a/api.md
+++ b/api.md
@@ -282,11 +282,7 @@ Action|Description|Parameters
 `addMac`|Adds a MAC to tracking|<ul><li>`mac`<ul><li>The MAC address to start tracking</li></ul></li>
 `removeMac`|Removes a MAC from tracking|<ul><li>`mac`<ul><li>The MAC address to stop tracking</li></ul></li>
 ## Community Python API
-<<<<<<< HEAD
-
 
 ## Further Information
-<sub><sup>made with love <3</sup></sub>
-=======
 A community python API wrapper exists [here](https://github.com/735tesla/python-pineapple) but documentation is still in progress.
->>>>>>> c63be13dd5c33eadcf50c05ba783c465c345b081
+<sub><sup>made with love <3</sup></sub>