add user1 in readme.txt
fix the conflict