fix merge
2 files changed