https://bugs.kde.org/show_bug.cgi?id=259574 --- Comment #50 from George L. Emigh <ab4bd at georgelemigh.com> --- KDE 4.9.1 Gentoo The conflict resolution box still appears a lot in 4.9.1... Thanks in advance. -- You are receiving this mail because: You are the assignee for the bug.