I've resolved my conflicts finally and now if I want to apply patch (Patch: Eventsview controls. With settings applet.) I always get the same message "failed to install patch" :-). What I did wrong?