Merge branch '635-update-the-bilby_result-method-to-enable-merging-results-with-inconsistent-parameters' into 'master'
Resolve "Update the bilby_result method to enable merging results with inconsistent parameters"
Closes #635
See merge request !1153