resolved conficts