5 out of 9 tests pass
Resolved merge conflicts