conflict
Merge branch 'feature/fstftr' of https://github.com/chess-levin/worldtest into feature/fstftr

Conflicts:
	myfeature.txt