merge 7heaven