update before leaving air
merge