I had a merge conflict on a 2000 line module and I had to manually scroll looking for the conflict.
When opening the file with the conflict, it should immediately scroll to the first conflict.
Even better, especially useful when there are more than one conflict, the Conflicts tab should have a list of links to each row with a conflict, so one could click on each link to resolve them one by one.
