merging from hana