fix: correct pact merge error message

lib/pact_broker/client/merge_pacts.rb

@@ -42,10 +42,9 @@ def merge original, additional
       private
 
       def almost_duplicate_message(original, new_interaction)
-        "An interaction with same description (#{new_interaction[:description].inspect}) and provider state (#{new_interaction[:providerState].inspect}) but a different request or response has already been used. " +
-          "Please use a different description or provider state, or hard-code any random data.\n" +
-          original.to_json + "\n\n"
-          new_interaction.to_json
+        "Two interactions have been found with same description (#{new_interaction[:description].inspect}) and provider state (#{new_interaction[:providerState].inspect}) but a different request or response. " +
+          "Please use a different description or provider state, or hard-code any random data.\n\n" +
+          original.to_json + "\n\n" + new_interaction.to_json
       end
 
       def same_description_and_state? original, additional

spec/lib/pact_broker/client/merge_pacts_spec.rb

@@ -60,7 +60,7 @@ module Client
           end
 
           it "raises an error" do
-            expect { subject }.to raise_error PactMergeError
+            expect { subject }.to raise_error PactMergeError, /foo.*different/
           end
         end
       end