[pacman-dev] [patch] resolveconflict clean-up