perf_event.c :Fix Merged Conflicts