Adding mandatority into the common document
Fixing merge conflict