-After merging, borders appeared over links
-made changes in main.css to fix these errors from merging the branch