modified a few files for merge demo