improve doc
fix conflit & update doc