3 out of 8 tests pass
Merge conflicts fixed