finished? the merge