merge bugs