Revert "merge conflict resolution"

This reverts commit f293c94419fe450c08d31674ea20d7658a41b90c.
Revert "Replaced deleted comment block"

This reverts commit 630408340f4af748cabd3db2456c46e46f020e6f.
Revert "Updated plugin-name.php to get all name replacement changes at one place"

This reverts commit a80b2ca7a491fbc1d9e0c2aba6f110b3384b2c47.