file rename
Merge commit '975bb848e36b1ae66736bf5d3d72106680250cd3'

Conflicts:
	folderA/A.txt