[develop] continue merging