fix of the merge