solve conflict #solv