merge-recursive: check for file level conflicts then get new name