local update
local merge
local working version of flight