kubuntu
conflict fixed