resolve conflicts

Signed-off-by: Balakrishna Avulapati <ba@bavulapati.com>

Author: bavulapati

PORTING.md

@@ -50,8 +50,6 @@ Tests covering the engine-specific part of Node-API, defined in `js_native_api.h
 | `test_array`                 | Ported ✅  | Easy       |
 | `test_bigint`                | Ported ✅  | Easy       |
 | `test_cannot_run_js`         | Not ported | Medium     |
-| `test_constructor`           | Not ported | Medium     |
-| `test_conversions`           | Ported ✅  | Medium     |
 | `test_constructor`           | Ported ✅  | Medium     |
 | `test_conversions`           | Ported ✅  | Medium     |
 | `test_dataview`              | Not ported | Medium     |