fixed the merge fail