flightboard work
merge error fix
more work on flightboard