update code for responsiveness
fix merge conflict