history: fix folder history, broken in merges