working on generation
conflict