some merge bugs