Revert "last fix on merge error"

This reverts commit 7552a44fbeb8c76ef98b5c2db19af05473f3b8ac.
Revert "merge error - fixed"

This reverts commit 04a6e7b7d3a20fe372584907b6dad74c4d11bf8f.
Revert "added comments for implementation"

This reverts commit 3902c024ce0d5108e5263691945e4d7b8f536f07.