Fix merge mistake
2 files changed