eventGenerate fix
conflict control