diff --git a/Readme.md b/Readme.md
index 3e2d9ae1..660c26b7 100644
--- a/Readme.md
+++ b/Readme.md
@@ -40,8 +40,4 @@
 | Entry Name | Type | Description |
 |:----------:|:----:|:-----------:|
 | LimitSwitch | Boolean | True for triggered |
-<<<<<<< HEAD
-| ExtensionPercent | Double | Percent extended |
-=======
-| ExtentionPercent | Double | Percent extended |
->>>>>>> 6b839d7 (Added Controller ID table, Motor ID table, and Network Tables table.)
+| ExtensionPercent | Double | Percent extended |
\ No newline at end of file