merge 2 of private frontend