Repair merge bugs