Fixed Merge issue
Fixed Mail config merge issue.