undoing change in how functions are merged (to be revised...)