fixed responsive edits
fixed merge conflicts