Fixed main.css merged conflicts