diff --git a/README.md b/README.md
index 92cb72e..1112de5 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,8 @@ And, you can learn informations about API in `APIDOCS.md`.
 ## To Do (Backend, bug fixes) 
 - Better error codes, example 400 for bad request
 - `/errors/error` will change, better error page.
-
+- Redirect query.
+- middleware for timeouts
 ## Roadmap
 - [x] User
   - [x] Login
@@ -31,6 +32,7 @@ And, you can learn informations about API in `APIDOCS.md`.
   - [x] Delete User
   - [ ] Singature & About me
   - [ ] Edit user
+  - [ ] IP BAN
 - [ ] Messages
   - [ ] Ratelimit for sending message
   - [x] Send message
@@ -46,7 +48,11 @@ And, you can learn informations about API in `APIDOCS.md`.
   - [ ] Multiple theme support 
   - [ ] Search 
   - [x] New Thread theme, better render for messages
+<<<<<<< HEAD
   - [ ] Sending message etc. Will turn api model
+=======
+  - [ ] Sending message etc. will turn api model
+>>>>>>> d2f644f6306f78b2888c933f90bf3c8e1c10b868
 - [ ] API
   - [x] Other client for forum via API    
   - [ ] Deleting message