merged frontend