Hi All, Some time back I wrote on this list to ask whether there was an accessible solution for comparing code in visual studio. Well, now I think I have found something that works quite well. The best i've seen so far to be honest. The comparison tool is called Code compare. https://www.devart.com/codecompare/ Once set up, you can move between the source and target files using control 1 and control 2. move to the next and previous differences with alt + up/down arrows. and replace content from one file to other by using alt + left/right arrow keys. The only thing that doesn't automatically happen for screen readers is when you switch to the other window, the line numbers are not in sync. So you have to ensure you find the correct matching lines by doing the same number of next difference keystrokes on both sides. Please give this a go and let everyone know your findings. I am very excited about this as resolving conflicts has been a major blocker to my work on almost a daily basis. Hope this helps. Kind regards, Chamandeep Singh Grover