Kaleidoscope is my go-to merge tool kinda surprised I didn’t see it mentioned yet. http://www.kaleidoscopeapp.com/