conflicts kdesvn4