Merge bugs