diff --git a/sources/tech/20170622 A users guide to links in the Linux filesystem.md b/sources/tech/20170622 A users guide to links in the Linux filesystem.md
index 5fc4defaeb..e1b29fd1eb 100644
--- a/sources/tech/20170622 A users guide to links in the Linux filesystem.md	
+++ b/sources/tech/20170622 A users guide to links in the Linux filesystem.md	
@@ -1,4 +1,7 @@
-Translating by Snapcrafter
+Translating by yongshouzhang
+
+
+>>>>>>> 1563bbe1de2eeca62e56312950525707690c3447
 A user's guide to links in the Linux filesystem
 ============================================================