ConflictsScreen: Only finish current activity when all conflicts resolved #142
background
wait
wait-all
cancel
Loading