fix the merge bugs