merging from dlab