tableaux responsive
fixing merge