Git conflict (rename/rename)

Question

After merging branched I\'ve received a conflict (rename/rename) on bunch of files, with file~HEAD, and file~my_test_branch created. How t