fix a wrong merging