fixed merge issues
18 files changed