Resolve minor conflict in Flash version with HEAD