merging some random changes. not sure what they are…
Fixed conflict on CSS file