Added conflict check to event addition