merge phastaDemo