tau flight variables
fix conflict