Fixed file merging issues.