merge.rspec: fixed spelling in error msg