Commit for document pop up
Merged and resolved conflicts