If a folder is renamed to an existing name, merge them
Merge pull request #118 from fajran/merge-folder-rename

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