Fix Merge issues
2 files changed