minor modified
solv conflicts