4 out of 6 tests pass
Fixed merge conflict