fix merge conflict and make sure the tests pass.