modify:ninja.Event_CustomEvent_Base
removed MERGE.swp
all done