fixed conflic