fix merging problem