fixed merge conflict
fixed responsive styles