merge-tree: handle directory/empty conflict correctly