fixing merging error