fix merging error