fixed conficted