ftrace: fix merge