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