Give option to show diff after conflictless merge
Use ProgressWindow everywhere
Remove unneeded import