fix merge problems
2 files changed