added comments to admin side
merge conflict fix 1