after merge we need to fix hasOwnProperty to use []