remove es5 option
merge