I think Meld is a great tool. I haven't found another free tool that works as well. https://meldmerge.org/