Added doc for conflicting events
Added tests around conflicting events