created update flight but can't update :'(
Merge remote-tracking branch 'origin/master'