1 files changed, 0 insertions, 1 deletions

diff --git a/readme.md b/readme.md
index 1075fd1..d9f83da 100644
--- a/readme.md
+++ b/readme.md
@@ -46,7 +46,6 @@ requires:
 ...
 ```
 
-<<<<<<< HEAD
 ## Example 
 For getting the current acceleration
 ```