machiatto layout merge in progress