update launcher
merge