fixed confict