minor fix for on_merge