added deleted files with git add -u .
Resolved conflict
defined the get events interface