Event url conflict

conflicts fixed