trying to make responsive
solving merge