make conflicts work again
chech obsoletes too
fix typo
adopt to reality