Pass problem7 tests.
conflict merge