merge up before demos