merge pre-demo