fix conflict
documentation