Update README.md

README.md

@@ -8,7 +8,7 @@
 	- [x] Swipe up toggles control mode and swipe down exits
 - [x] Swipe left/right goes to watchface/another app
 - [x] Rearrange quick acces and apps
-
+- [x] Exponent button on calculator
 
 ## Pending merge
 
@@ -22,21 +22,13 @@
 - [ ] Remap button double click (to music app)
 
 ### Moses
-<<<<<<< HEAD
 
-=======
-- [x] Redo music control gestures
-	- [x] Swipe up toggles control mode and swipe down exits
-	- [x] Swipe left/right goes to watchface/another app
-- [x] Exponent button on calculator
-- [x] Rearrange quick acces and apps
+
 - [ ] Add quick ring settings
 
->>>>>>> refs/remotes/origin/main
 ## Medium priority
 - [ ] Temp sensor w/ arduino
 - [ ] Homeassistant control
-- [ ] Periodic heart rate measurement
 
 ## Lower priority
 - [ ] Maybe some prank watchfaces