Now the merge is correct.