main.css had git merge conflict markers

Removed the markers, and got rid of the lines that were supposed to go when the conflict happened.