Added support for event handler conflicts