merge with demo6D