modified a couple files for merge demo