When in the conflict resolution screen it would be nice to quickly see all files that have been auto resolved. Maybe with a icon of some sort on the left hand side next to the circle icon for resolved or not resolved.