If a folder is renamed to an existing name, merge them

This fixes #117