fixed conflit