fix some merge