merge last update