Resolve conficts