diff --git a/README.md b/README.md
index 943732a..c2f9c22 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,3 @@
-<<<<<<< HEAD
-# zRenardWatch
-Garmin Watch Face
-
-Available on Garmin ConnectIQ : https://apps.garmin.com/fr-FR/apps/4c058f81-a930-4527-9fc8-fa65d69d4ef4
-# Settings
-
-## Colors
-* Background
-* Foreground
-* Date color
-
-## Display
-* Show Notifications (On/Off)
-* Use sleep mode (On/Off). In sleep mode, display only clock.
-* Option to use bigger font
-
-## Battery level show
-* Minimum value to display %
-* Minimum value to show highlight/warning
-
-## Display inactivity status
-* Show inactivity (On/Off)
-* Display as circle, icons on top, or icons on bottom/left
-* Set inactivity circle color
-=======
 # zRenardWatch
 Garmin Watch Face
 
@@ -43,4 +17,8 @@ Available on Garmin ConnectIQ : https://apps.garmin.com/fr-FR/apps/4c058f81-a930
 ## Battery level show
 * Minimum value to display %
 * Minimum value to show highlight/warning
->>>>>>> 33300a8b9f6afaeff577c35da76278ef9ab10f15
+
+## Display inactivity status
+* Show inactivity (On/Off)
+* Display as circle, icons on top, or icons on bottom/left
+* Set inactivity circle color
\ No newline at end of file