Fix merge conflicts
2 files changed