fix file merging error