stashing changes
fixed merge conflicts
html and css
conflicts fixed