update workspace
remove conflict
add comments, only docs left