fixed multi entry confict