Encountered this same problem. In my instance I pressed q and at the bottom right of the terminal it said "recording" at which point :wq then Enter worked and the merge completed.