conflict resolution - main.css

If any of your work was deleted let me know.