resolve conficts