diff --git a/doc/acl-layer.png b/doc/acl-layer.png
new file mode 100644
index 0000000..f0f9b9c
Binary files /dev/null and b/doc/acl-layer.png differ
diff --git a/doc/auth.md b/doc/auth.md
index e130a17..819326d 100644
--- a/doc/auth.md
+++ b/doc/auth.md
@@ -76,11 +76,8 @@ HTTP Code | Status | Description
 - password: required and not empty
 
 *if any special logic, please write down the logic here. thanks*
-<<<<<<< HEAD
 
 
-=======
->>>>>>> [#9] add documentation