updating the default document
Solving version Confilict
Solving version Confilict