Revert "resolving merge issues"

This reverts commit 76f500dc0fc76f6802b31237e4bd08612a74ffc5.