Fix mismerges
2 files changed