diff --git a/README.md b/README.md
index 67daf41..05a8b8f 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,10 @@ Username and password are definied during installation.
 
     yunohost app remove movim
 
+**Notes**
+
+* URL rewriting is disabled (experimental feature)
+
 **Help**
 
 support@conference.yunohost.org src386_
diff --git a/TODO b/TODO
index c92d4c1..4985620 100644
--- a/TODO
+++ b/TODO
@@ -1 +1,4 @@
+<<<<<<< HEAD
 - Add SSO support
+=======
+>>>>>>> master