# Conflicts: # src/App.js # src/components/ProfileCalendar/ProfileCalendar.js # src/components/ReportForm/ReportForm.js # src/pages/Profile.js