Rename fixingthemergeconflictcausedbyoneextracommitonteammentormaster-2.txt to fixingthemergeconflictcausedbyoneextracommitonteammentormaster-2.md