Let the merge finish running. Sometimes this can take quite a few minutes.