keeping the content

in the doc
fixing conflict

hahaha