fix merge problem with duplicate functions.