minor change
commit to pull
fixed merge conflicts
css styling changes
resolving conflicts