merge sulong stuff