fixed some merge bugs