fix Merge bugs