fix merging failure