fixed confict error