fixed conficts