fixed evenement.txt
fixing merge conflict