Fixed merge bugs and changed default EventName