removed border
Resolving merge conflict in styles.css
style.css updates