fix the merge