Harrogate law firm announces merger