use unique file names for conflict files (fixes #62)#123

wonder-sk merged 4 commits intomasterMerginMaps/python-api-client:masterfrom

conflict_unique_namesMerginMaps/python-api-client:conflict_unique_namesCopy head branch name to clipboard