Fix mergefail, but the test doesn't pass