Fix failures introduced by buggy merge (1)
2 files changed