added idea
resolve confilce