edit demo after merge