solved merge conflict. integrated hardware with web application on index_concentratio