Modified a few files formerge demo