add a combine_hunks method