resolve conficts oO