javitasok, frontend merge