fix some merge bugs