merge newer stuff into remote-host