merge design - initial