I just got this for the first time and was happy to see a new merge tool. It took me a long time to notice the blue tutorial dots, and at first I thought it was something on my screen before I realized I was supposed to click on it. Overall it looks great, and resolving the conflict was pretty intuitive. Thanks for all the work on this.
