remove conficts.