fixed merging issues
2 files changed