reponssive page work
fix merge conflict