Update epoll.cc

Removed the merge conflict....