merge diff1 from streamer45