My conflict in Events Unit
Fixing conflict