remove merge bugs