Add doc
fix conflict