merge frontend