merge
design integration