merge new frontend