fixing conficts.